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

List:       kde-commits
Subject:    KDE/kdepim/kmobiletools/kmobiletools
From:       Marco Gulino <marco () kmobiletools ! org>
Date:       2007-05-31 0:15:11
Message-ID: 1180570511.819573.3683.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 669997 by gulino:

Config widget for knotifier.


 M  +3 -3      kmobiletoolsui.rc  
 M  +1 -1      mainpart/CMakeLists.txt  
 M  +3 -2      mainpart/kmobiletools_mainpart.cpp  
 M  +9 -11     mainpart/kmobiletools_mainpart.rc  


--- trunk/KDE/kdepim/kmobiletools/kmobiletools/kmobiletoolsui.rc #669996:669997
@@ -4,9 +4,10 @@
     <MenuBar>
         <Menu name="file" noMerge="1">
             <text>&amp;File</text>
-            <Merge name="kmobiletools_mainpart"/>
+            <Merge name="files_merge"/>
         </Menu>
-        <Menu noMerge="1" name="settings"><text>&amp;Settings</text>
+        <Menu name="settings" noMerge="1">
+            <text>&amp;Settings</text>
             <Merge name="StandardToolBarMenuHandler"/>
             <Action name="options_show_toolbar"/>
             <Action name="options_show_statusbar"/>
@@ -15,7 +16,6 @@
             <Action name="options_configure_keybinding"/>
             <Action name="options_configure_toolbars"/>
             <Action name="options_configure"/>
-            <Action name="device_manager"/>
             <Merge name="configure_merge"/>
             <Separator/>
             <Merge/>
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/CMakeLists.txt #669996:669997
@@ -41,7 +41,7 @@
 
 kde4_add_plugin(kmobiletoolsmainpart WITH_PREFIX ${kmobiletoolsmainpart_PART_SRCS})
 
-target_link_libraries(kmobiletoolsmainpart  kmobiletools kabc_file_core \
${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KRESOURCES_LIBS} \
${KDE4_KABC_LIBS}) +target_link_libraries(kmobiletoolsmainpart  kmobiletools \
kabc_file_core ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} \
${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} )  
 install(TARGETS kmobiletoolsmainpart DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/kmobiletools_mainpart.cpp \
#669996:669997 @@ -46,6 +46,7 @@
 #include <kinputdialog.h>
 #include <kplugininfo.h>
 #include <q3sqlpropertymap.h>
+#include <knotifyconfigwidget.h>
 
 #include <libkmobiletools/kmobiletools_cfg.h>
 #include <libkmobiletools/devicesconfig.h>
@@ -124,7 +125,7 @@
     actionCollection()->addAction(KStandardAction::Prior, "prev", this, \
SLOT(prevPart() ) );  //     \
actionCollection()->addAction(KStandardAction::Preferences, "options_configure", \
                this, SLOT(showPreference() ) );
     actionCollection()->addAction(KStandardAction::Quit, "file_quit", this, \
                SLOT(slotQuit() ) );
-    actionCollection()->addAction(KStandardAction::ConfigureNotifications, \
"cfgnotify", this, SLOT(slotConfigNotify() ) ); +    \
actionCollection()->addAction(KStandardAction::ConfigureNotifications, \
"options_configure_notifications", this, SLOT(slotConfigNotify() ) );  
 
 
@@ -637,5 +638,5 @@
  */
 void kmobiletoolsMainPart::slotConfigNotify()
 {
-///    KNotifyDialog::configure(m_widget, 0); @TODO port to KNotifyDialog
+    KNotifyConfigWidget::configure(m_widget, 0);
 }
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/kmobiletools_mainpart.rc \
#669996:669997 @@ -1,30 +1,28 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <kpartgui name="kmobiletools_mainpart" version="1">
     <MenuBar>
-        <Menu name="file" nomerge="0"><text>&amp;File</text>
+        <Menu name="file"><text>&amp;File</text>
             <Action name="home"/>
             <Action name="prev"/>
             <Action name="next"/>
-            <Merge />
             <Separator />
             <Action name="file_quit"/>
         </Menu>
         <Menu name="settings"><text>&amp;Settings</text>
             <Separator/>
+            <Action name="options_configure_notifications" />
             <Action name="device_manager" />
-            <Action name="cfgnotify"/>
-            <Action name="options_configure" />
             <Merge/>
         </Menu>
     </MenuBar>
-    <ToolBar noMerge="1" name="mainpart_toolbar"><text>Main Toolbar</text>
-        <Action name="device_manager"/>
-        <Action name="home"/>
-        <Action name="prev"/>
-        <Action name="next"/>
-        <Action name="help"/>
+    <ToolBar name="mainpart_toolbar"><text>Main Toolbar</text>
+        <Action name="device_manager" />
+        <Action name="home" />
+        <Action name="prev" />
+        <Action name="next" />
+        <Action name="help" />
     </ToolBar>
-    <ToolBar noMerge="1" name="deviceToolBar">
+    <ToolBar nname="deviceToolBar">
         <ActionList name="kmobiletools_devicepart.rc" />
     </ToolBar>
 </kpartgui>


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