Added configuration option for max characters displayed in notes. Fixes bug 1635

5 files changed, 54 insertions, 11 deletions

diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
index 5fd5221..6b7c3ce 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
@@ -50,2 +50,4 @@ void DatebookPluginConfig::readConfig() {
     m_gui->SpinBox2->setValue( m_more_days );
+    m_maxCharClip = cfg.readNumEntry( "maxcharclip" , 38 );
+    m_gui->SpinBox3->setValue( m_maxCharClip );
 }
@@ -68,2 +70,4 @@ void DatebookPluginConfig::writeConfig() {
     cfg.writeEntry( "moredays", m_more_days );
+    m_maxCharClip = m_gui->SpinBox3->value();
+    cfg.writeEntry( "maxcharclip", m_maxCharClip );
     cfg.write();
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h
index 4f4e3f1..61e31e0 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.h
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h
@@ -58,2 +58,3 @@ private:
     int m_more_days;
+    int m_maxCharClip;
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfigbase.ui b/core/pim/today/plugins/datebook/datebookpluginconfigbase.ui
index 943e8ec..004204a 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfigbase.ui
+++ b/core/pim/today/plugins/datebook/datebookpluginconfigbase.ui
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>228</width>
+            <width>224</width>
             <height>267</height>
@@ -25,3 +25,3 @@
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
@@ -34,3 +34,3 @@
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QCheckBox</class>
@@ -49,3 +49,3 @@
         </widget>
-        <widget>
+        <widget row="1"  column="0" >
             <class>QCheckBox</class>
@@ -64,3 +64,3 @@
         </widget>
-        <widget>
+        <widget row="2"  column="0" >
             <class>QCheckBox</class>
@@ -79,3 +79,3 @@
         </widget>
-        <widget>
+        <widget row="3"  column="0" >
             <class>QCheckBox</class>
@@ -90,3 +90,3 @@
         </widget>
-        <widget>
+        <widget row="4"  column="0" >
             <class>QLayoutWidget</class>
@@ -140,3 +140,3 @@
         </widget>
-        <widget>
+        <widget row="5"  column="0" >
             <class>QLayoutWidget</class>
@@ -194,3 +194,38 @@
         </widget>
-        <spacer>
+        <widget row="6"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout6</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QSpinBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>SpinBox3</cstring>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel1_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Clip line after X chars</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <spacer row="7"  column="0" >
             <property>
@@ -215,3 +250,3 @@
         </spacer>
-    </vbox>
+    </grid>
 </widget>
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index 0820802..eb6d47a 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -56,2 +56,3 @@ void DatebookPluginWidget::readConfig() {
     m_timeExtraLine = cfg.readNumEntry( "timeextraline",  1 );
+    m_maxCharClip = cfg.readNumEntry( "maxcharclip", 38 );
 }
@@ -98,3 +99,3 @@ void DatebookPluginWidget::getDates() {
                     count++;
-                    DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
+                    DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine, m_maxCharClip );
                     m_eventsList.append( l );
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h
index f8ed89e..65e060e 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.h
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h
@@ -59,2 +59,4 @@ private:
     bool m_timeExtraLine;
+    //max characters displayed in notes
+    int m_maxCharClip;
 };