[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    tags/KDE/3.5.0/kdepim
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-11-20 10:50:00
Message-ID: 1132483800.260526.21569.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 481743 by coolo:

retag some more commits


 M  +1 -1      akregator/src/feed.cpp  
 M  +21 -11    akregator/src/propertiesdialog.cpp  
 M  +1 -1      akregator/src/settings_browser.ui  
 M  +8 -1      konsolekalendar/main.cpp  
 M  +1 -0      kontact/plugins/knode/knodeplugin.desktop  
 M  +1 -0      kontact/src/kontact.setdlg  


--- tags/KDE/3.5.0/kdepim/akregator/src/feed.cpp #481742:481743
@@ -133,7 +133,7 @@
 
         QString htmlUrl = e.attribute("htmlUrl");
         QString description = e.attribute("description");
-        int fetchInterval = e.attribute("fetchInterval").toUInt();
+        int fetchInterval = e.attribute("fetchInterval").toInt();
         ArchiveMode archiveMode = stringToArchiveMode(e.attribute("archiveMode"));
         int maxArticleAge = e.attribute("maxArticleAge").toUInt();
         int maxArticleNumber = e.attribute("maxArticleNumber").toUInt();
--- tags/KDE/3.5.0/kdepim/akregator/src/propertiesdialog.cpp #481742:481743
@@ -223,43 +223,53 @@
    widget->urlEdit->setText(url);
 }
 
-void FeedPropertiesDialog::setAutoFetch(bool w)
+void FeedPropertiesDialog::setAutoFetch(bool customFetchEnabled)
 {
-   widget->upChkbox->setChecked(w);
-   widget->updateSpinBox->setEnabled(w);
+    widget->upChkbox->setChecked(customFetchEnabled);
+    widget->updateComboBox->setEnabled(customFetchEnabled);
+
+    if (widget->updateSpinBox->value() > -1)
+        widget->updateSpinBox->setEnabled(customFetchEnabled);
+    else
+        widget->updateSpinBox->setEnabled(false);
 }
 
-void FeedPropertiesDialog::setFetchInterval(int i)
+void FeedPropertiesDialog::setFetchInterval(int interval)
 {
-    if (i == -1)
+    if (interval == -1) // never update
     {
         widget->updateSpinBox->setValue(0);
+        widget->updateSpinBox->setDisabled(true);
         widget->updateComboBox->setCurrentItem(3); // never
         return;
     }
 
-    if (i == 0)
+    if (interval == 0)
     {
         widget->updateSpinBox->setValue(0);
+        widget->updateSpinBox->setEnabled(widget->upChkbox->isChecked());
         widget->updateComboBox->setCurrentItem(0); // minutes
         return;
     }
 
-   if (i % (60*24) == 0)
+   if (interval % (60*24) == 0)
    {
-       widget->updateSpinBox->setValue(i / (60*24) );
+       widget->updateSpinBox->setValue(interval / (60*24) );
+       widget->updateSpinBox->setEnabled(widget->upChkbox->isChecked());
        widget->updateComboBox->setCurrentItem(2); // days
        return;
    }
 
-   if (i % 60 == 0)
+   if (interval % 60 == 0)
    {
-       widget->updateSpinBox->setValue(i / 60 );
+       widget->updateSpinBox->setValue(interval / 60 );
+       widget->updateSpinBox->setEnabled(widget->upChkbox->isChecked());
        widget->updateComboBox->setCurrentItem(1); // hours
        return;
    }
 
-   widget->updateSpinBox->setValue(i);
+   widget->updateSpinBox->setValue(interval);
+   widget->updateSpinBox->setEnabled(widget->upChkbox->isChecked());
    widget->updateComboBox->setCurrentItem(0); // minutes
 }
 
--- tags/KDE/3.5.0/kdepim/akregator/src/settings_browser.ui #481742:481743
@@ -64,7 +64,7 @@
                         <bool>false</bool>
                     </property>
                     <property name="text">
-                        <string>firefox -remote 'openURL(%u,new-tab)'</string>
+                        <string>firefox %u</string>
                     </property>
                 </widget>
             </grid>
--- tags/KDE/3.5.0/kdepim/konsolekalendar/main.cpp #481742:481743
@@ -50,6 +50,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
+#include <kstandarddirs.h>
 #include <kdebug.h>
 
 #include <libkcal/calformat.h>
@@ -723,7 +724,13 @@
     calendarResource = new StdCalendar( variables.getCalendarFile(),
                                         i18n( "Active Calendar" ) );
   } else {
-    calendarResource = new StdCalendar();
+    // TODO: when certain resources (kolab) don't try to gain access to
+    // an X server, or dcopserver, then put back the following line which
+    // supports all resources, not just the standard resource.
+    // calendarResource = new StdCalendar();
+    calendarResource = new StdCalendar( locateLocal( "data",
+                                                     "korganizer/std.ics" ),
+                                        i18n( "Default Calendar" ) );
   }
   if ( !args->isSet( "import" ) ) {
     variables.setCalendar( calendarResource );
--- tags/KDE/3.5.0/kdepim/kontact/plugins/knode/knodeplugin.desktop #481742:481743
@@ -67,6 +67,7 @@
 Name[cs]=Novinky
 Name[cy]=Newyddion
 Name[da]=Nyheder
+Name[de]=Usenet
 Name[el]=Νέα
 Name[es]=Noticias
 Name[et]=Uudised
--- tags/KDE/3.5.0/kdepim/kontact/src/kontact.setdlg #481742:481743
@@ -399,6 +399,7 @@
 Name[cs]=Novinky
 Name[cy]=Newyddion
 Name[da]=Nyheder
+Name[de]=Usenet
 Name[el]=Νέα
 Name[es]=Noticias
 Name[et]=Uudised
[prev in list] [next in list] [prev in thread] [next in thread]