[prev in list] [next in list] [prev in thread] [next in thread]
List: knode-devel
Subject: [Knode-devel] KDE/kdepim
From: Will Stephenson <wstephenson () kde ! org>
Date: 2008-05-27 22:09:18
Message-ID: 1211926158.181792.23880.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 813516 by wstephens:
Split .setdlg files, describing the Kontact menu structure, out of one
single file on Matthias Kretz' advice. This seems counterintuitive
compared to what the docu says but the components are now visible in the
Configure Kontact dialog.
Also add the X-KDE-Weight field to all KCMs appearing in Kontact so that
they appear in the same order as in the apps running standalone.
Note: Akregator's configure dialog is empty when opened with "Configure
Akregator" when embedded, but works when viewed in the "Configure
Kontact" dialog and when running standalone. I think this may be a
separate problem.
This at least makes it possible to enable KNode, part of this bug:
https://bugzilla.novell.com/show_bug.cgi?id=389141
CCMAIL: kretz@kde.org
M +2 -1 akregator/configuration/akregator_config_advanced.desktop
M +2 -1 akregator/configuration/akregator_config_appearance.desktop
M +2 -1 akregator/configuration/akregator_config_archive.desktop
M +2 -1 akregator/configuration/akregator_config_browser.desktop
M +2 -1 akregator/configuration/akregator_config_general.desktop
M +1 -0 kaddressbook/kcmconfigs/kabconfig.desktop
M +1 -0 kaddressbook/kcmconfigs/kabcustomfields.desktop
M +1 -0 kaddressbook/kcmconfigs/kabldapconfig.desktop
M +1 -0 kmail/kmail_config_accounts.desktop
M +1 -0 kmail/kmail_config_appearance.desktop
M +1 -0 kmail/kmail_config_composer.desktop
M +1 -0 kmail/kmail_config_identity.desktop
M +1 -0 kmail/kmail_config_misc.desktop
M +1 -0 kmail/kmail_config_security.desktop
M +1 -0 knode/knode_config_accounts.desktop
M +1 -0 knode/knode_config_appearance.desktop
M +1 -0 knode/knode_config_cleanup.desktop
M +1 -0 knode/knode_config_identity.desktop
M +1 -0 knode/knode_config_post_news.desktop
M +1 -0 knode/knode_config_privacy.desktop
M +1 -0 knode/knode_config_read_news.desktop
M +2 -0 kontact/plugins/akregator/CMakeLists.txt
A kontact/plugins/akregator/akregator.setdlg
M +2 -0 kontact/plugins/kaddressbook/CMakeLists.txt
A kontact/plugins/kaddressbook/kaddressbook.setdlg
M +1 -0 kontact/plugins/kjots/CMakeLists.txt
A kontact/plugins/kjots/kjots.setdlg
M +2 -0 kontact/plugins/kmail/CMakeLists.txt
A kontact/plugins/kmail/kmail.setdlg
M +1 -0 kontact/plugins/kmobiletools/CMakeLists.txt
A kontact/plugins/kmobiletools/kmobiletools.setdlg
M +1 -0 kontact/plugins/knode/CMakeLists.txt
A kontact/plugins/knode/knode.setdlg
M +1 -1 kontact/plugins/knotes/CMakeLists.txt
A kontact/plugins/knotes/knotes.setdlg
M +2 -0 kontact/plugins/korganizer/CMakeLists.txt
A kontact/plugins/korganizer/korganizer.setdlg
M +1 -0 kontact/plugins/ktimetracker/CMakeLists.txt
A kontact/plugins/ktimetracker/ktimetracker.setdlg
M +1 -0 kontact/plugins/newsticker/CMakeLists.txt
A kontact/plugins/newsticker/newsticker.setdlg
M +1 -0 kontact/plugins/planner/CMakeLists.txt
A kontact/plugins/planner/planner.setdlg
M +1 -0 kontact/plugins/specialdates/CMakeLists.txt
A kontact/plugins/specialdates/specialdates.setdlg
M +1 -0 kontact/plugins/summary/CMakeLists.txt
A kontact/plugins/summary/summary.setdlg
M +2 -0 kontact/plugins/weather/CMakeLists.txt
A kontact/plugins/weather/weather.setdlg
M +0 -1 kontact/src/CMakeLists.txt
D kontact/src/kontact.setdlg
M +1 -0 korganizer/korganizer_configcolorsandfonts.desktop
M +1 -0 korganizer/korganizer_configdesignerfields.desktop
M +1 -0 korganizer/korganizer_configfreebusy.desktop
M +1 -0 korganizer/korganizer_configgroupscheduling.desktop
M +1 -0 korganizer/korganizer_configmain.desktop
M +1 -0 korganizer/korganizer_configplugins.desktop
M +1 -0 korganizer/korganizer_configtime.desktop
M +1 -0 korganizer/korganizer_configviews.desktop
--- trunk/KDE/kdepim/akregator/configuration/akregator_config_advanced.desktop \
#813515:813516 @@ -6,8 +6,9 @@
X-KDE-Library=akregator_config_advanced
X-KDE-ParentApp=akregator
-X-KDE-ParentComponents=akregator,kontact_akregator
+X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
+X-KDE-Weight=500
Name=Advanced
Name[ca]=Avançat
--- trunk/KDE/kdepim/akregator/configuration/akregator_config_appearance.desktop \
#813515:813516 @@ -6,8 +6,9 @@
X-KDE-Library=akregator_config_appearance
X-KDE-ParentApp=akregator
-X-KDE-ParentComponents=akregator,kontact_akregator
+X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
+X-KDE-Weight=300
Name=Appearance
Name[be]=Вонкавы выгляд
--- trunk/KDE/kdepim/akregator/configuration/akregator_config_archive.desktop \
#813515:813516 @@ -6,8 +6,9 @@
X-KDE-Library=akregator_config_archive
X-KDE-ParentApp=akregator
-X-KDE-ParentComponents=akregator,kontact_akregator
+X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
+X-KDE-Weight=200
Name=Archive
Name[ca]=Arxiu
--- trunk/KDE/kdepim/akregator/configuration/akregator_config_browser.desktop \
#813515:813516 @@ -6,8 +6,9 @@
X-KDE-Library=akregator_config_browser
X-KDE-ParentApp=akregator
-X-KDE-ParentComponents=akregator,kontact_akregator
+X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
+X-KDE-Weight=400
Name=Browser
Name[ca]=Navegador
--- trunk/KDE/kdepim/akregator/configuration/akregator_config_general.desktop \
#813515:813516 @@ -6,8 +6,9 @@
X-KDE-Library=akregator_config_general
X-KDE-ParentApp=akregator
-X-KDE-ParentComponents=akregator,kontact_akregator
+X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
+X-KDE-Weight=100
Name=General
Name[af]=Algemeen
--- trunk/KDE/kdepim/kaddressbook/kcmconfigs/kabconfig.desktop #813515:813516
@@ -8,6 +8,7 @@
X-KDE-ParentApp=kaddressbook
X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
X-KDE-CfgDlgHierarchy=KAB
+X-KDE-Weight=100
Name=General
Name[af]=Algemeen
--- trunk/KDE/kdepim/kaddressbook/kcmconfigs/kabcustomfields.desktop #813515:813516
@@ -8,6 +8,7 @@
X-KDE-ParentApp=kaddressbook
X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
X-KDE-CfgDlgHierarchy=KAB
+X-KDE-Weight=200
Name=Custom Pages
Name[af]=Pasmaak Blaaie
--- trunk/KDE/kdepim/kaddressbook/kcmconfigs/kabldapconfig.desktop #813515:813516
@@ -8,6 +8,7 @@
X-KDE-ParentApp=kaddressbook
X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
X-KDE-CfgDlgHierarchy=KAB
+X-KDE-Weight=300
Name=LDAP Lookup
Name[af]=LDAP Opkyk
--- trunk/KDE/kdepim/kmail/kmail_config_accounts.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=kmail
X-KDE-ParentComponents=kmail,kontact_kmailplugin
X-KDE-CfgDlgHierarchy=KMail
+X-KDE-Weight=200
Name=Accounts
Name[af]=Rekeninge
--- trunk/KDE/kdepim/kmail/kmail_config_appearance.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=kmail
X-KDE-ParentComponents=kmail,kontact_kmailplugin
X-KDE-CfgDlgHierarchy=KMail
+X-KDE-Weight=300
Name=Appearance
Name[be]=Вонкавы выгляд
--- trunk/KDE/kdepim/kmail/kmail_config_composer.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=kmail
X-KDE-ParentComponents=kmail,kontact_kmailplugin
X-KDE-CfgDlgHierarchy=KMail
+X-KDE-Weight=400
Name=Composer
Name[bg]= едактор
--- trunk/KDE/kdepim/kmail/kmail_config_identity.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=kmail
X-KDE-ParentComponents=kmail,kontact_kmailplugin
X-KDE-CfgDlgHierarchy=KMail
+X-KDE-Weight=100
Name=Identities
Name[be]=Увасабленні
--- trunk/KDE/kdepim/kmail/kmail_config_misc.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=kmail
X-KDE-ParentComponents=kmail,kontact_kmailplugin
X-KDE-CfgDlgHierarchy=KMail
+X-KDE-Weight=600
Name=Misc
Name[af]=Allerlei
--- trunk/KDE/kdepim/kmail/kmail_config_security.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=kmail
X-KDE-ParentComponents=kmail,kontact_kmailplugin
X-KDE-CfgDlgHierarchy=KMail
+X-KDE-Weight=500
Name=Security
Name[af]=Sekuriteit
--- trunk/KDE/kdepim/knode/knode_config_accounts.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=knode
X-KDE-ParentComponents=knode,kontact_knodeplugin
X-KDE-CfgDlgHierarchy=KNode
+X-KDE-Weight=200
Name=Accounts
Name[af]=Rekeninge
--- trunk/KDE/kdepim/knode/knode_config_appearance.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=knode
X-KDE-ParentComponents=knode,kontact_knodeplugin
X-KDE-CfgDlgHierarchy=KNode
+X-KDE-Weight=300
Name=Appearance
Name[be]=Вонкавы выгляд
--- trunk/KDE/kdepim/knode/knode_config_cleanup.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=knode
X-KDE-ParentComponents=knode,kontact_knodeplugin
X-KDE-CfgDlgHierarchy=KNode
+X-KDE-Weight=700
Name=Cleanup
Name[bg]=Изчистване
--- trunk/KDE/kdepim/knode/knode_config_identity.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=knode
X-KDE-ParentComponents=knode,kontact_knodeplugin
X-KDE-CfgDlgHierarchy=KNode
+X-KDE-Weight=100
Name=Identity
Name[af]=Identiteit
--- trunk/KDE/kdepim/knode/knode_config_post_news.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=knode
X-KDE-ParentComponents=knode,kontact_knodeplugin
X-KDE-CfgDlgHierarchy=KNode
+X-KDE-Weight=500
Name=Posting News
Name[af]=Pos Nuus
--- trunk/KDE/kdepim/knode/knode_config_privacy.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=knode
X-KDE-ParentComponents=knode,kontact_knodeplugin
X-KDE-CfgDlgHierarchy=KNode
+X-KDE-Weight=600
Name=Signing/Verifying
Name[af]=Teken/Bevestig
--- trunk/KDE/kdepim/knode/knode_config_read_news.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=knode
X-KDE-ParentComponents=knode,kontact_knodeplugin
X-KDE-CfgDlgHierarchy=KNode
+X-KDE-Weight=400
Name=Reading News
Name[af]=Lees Nuus
--- trunk/KDE/kdepim/kontact/plugins/akregator/CMakeLists.txt #813515:813516
@@ -19,3 +19,5 @@
install(FILES akregatorplugin.desktop akregatorplugin3.2.desktop DESTINATION \
${SERVICES_INSTALL_DIR}/kontact)
+install(FILES akregator.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog) +
--- trunk/KDE/kdepim/kontact/plugins/kaddressbook/CMakeLists.txt #813515:813516
@@ -19,3 +19,5 @@
install(FILES kaddressbookplugin.desktop DESTINATION \
${SERVICES_INSTALL_DIR}/kontact)
+install(FILES kaddressbook.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog) +
--- trunk/KDE/kdepim/kontact/plugins/kjots/CMakeLists.txt #813515:813516
@@ -19,4 +19,5 @@
install( FILES kjots_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
+install(FILES kjots.setdlg DESTINATION ${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/kmail/CMakeLists.txt #813515:813516
@@ -38,3 +38,5 @@
install( FILES kmailplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
install( FILES kcmkmailsummary.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+
+install(FILES kmail.setdlg DESTINATION ${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/kmobiletools/CMakeLists.txt #813515:813516
@@ -17,3 +17,4 @@
install(FILES kmobiletools.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
+install(FILES kmobiletools.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/knode/CMakeLists.txt #813515:813516
@@ -17,3 +17,4 @@
install(FILES knodeplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
+install(FILES knode.setdlg DESTINATION ${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/knotes/CMakeLists.txt #813515:813516
@@ -21,4 +21,4 @@
install(FILES knotesplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
install(FILES org.kde.kontact.KNotes.xml DESTINATION ${KDE4_DBUS_INTERFACES_DIR})
-
+install(FILES knotes.setdlg DESTINATION ${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/korganizer/CMakeLists.txt #813515:813516
@@ -63,6 +63,8 @@
install(FILES korganizerplugin.desktop todoplugin.desktop journalplugin.desktop \
DESTINATION ${SERVICES_INSTALL_DIR}/kontact) install(FILES kcmapptsummary.desktop \
kcmtodosummary.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES korganizer.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog) +
kde4_install_icons(${ICON_INSTALL_DIR})
--- trunk/KDE/kdepim/kontact/plugins/ktimetracker/CMakeLists.txt #813515:813516
@@ -17,3 +17,4 @@
install(FILES karmplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
+install(FILES ktimetracker.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/newsticker/CMakeLists.txt #813515:813516
@@ -23,3 +23,4 @@
install(FILES newstickerplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
install(FILES kcmkontactknt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES newsticker.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/planner/CMakeLists.txt #813515:813516
@@ -28,3 +28,4 @@
install(FILES plannerplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
install(FILES kcmplanner.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES planner.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/specialdates/CMakeLists.txt #813515:813516
@@ -28,4 +28,5 @@
install(FILES specialdatesplugin.desktop DESTINATION \
${SERVICES_INSTALL_DIR}/kontact) install(FILES kcmsdsummary.desktop DESTINATION \
${SERVICES_INSTALL_DIR})
+install(FILES specialdates.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/summary/CMakeLists.txt #813515:813516
@@ -31,3 +31,4 @@
install(FILES kcmkontactsummary.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES kontactsummary_part.rc DESTINATION \
${DATA_INSTALL_DIR}/kontactsummary)
+install(FILES summary.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
--- trunk/KDE/kdepim/kontact/plugins/weather/CMakeLists.txt #813515:813516
@@ -15,3 +15,5 @@
install(FILES weatherplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
+install(FILES weather.setdlg DESTINATION \
${DATA_INSTALL_DIR}/kontact/ksettingsdialog) +
--- trunk/KDE/kdepim/kontact/src/CMakeLists.txt #813515:813516
@@ -57,7 +57,6 @@
install( FILES Kontact.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install( FILES kontact.kcfg DESTINATION ${KCFG_INSTALL_DIR})
install( FILES kontactconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install( FILES kontactui.rc kontact.setdlg DESTINATION ${DATA_INSTALL_DIR}/kontact)
kde4_install_icons( ${ICON_INSTALL_DIR} )
--- trunk/KDE/kdepim/korganizer/korganizer_configcolorsandfonts.desktop \
#813515:813516 @@ -10,6 +10,7 @@
X-KDE-ParentApp=korganizer
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=400
Name=Colors and Fonts
Name[ca]=Colors i tipus de lletra
--- trunk/KDE/kdepim/korganizer/korganizer_configdesignerfields.desktop \
#813515:813516 @@ -10,6 +10,7 @@
X-KDE-ParentApp=kaddressbook
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=800
Name=Custom Pages
Name[af]=Pasmaak Blaaie
--- trunk/KDE/kdepim/korganizer/korganizer_configfreebusy.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=korganizer
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=600
Name=Free/Busy
Name[af]=Beskikbaar/Besig
--- trunk/KDE/kdepim/korganizer/korganizer_configgroupscheduling.desktop \
#813515:813516 @@ -10,6 +10,7 @@
X-KDE-ParentApp=korganizer
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=500
Name=Group Scheduling
Name[af]=Groep Skedulering
--- trunk/KDE/kdepim/korganizer/korganizer_configmain.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=korganizer
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=100
Name=General
Name[af]=Algemeen
--- trunk/KDE/kdepim/korganizer/korganizer_configplugins.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=korganizer
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=700
Name=Plugins
Name[af]=Inprop modules
--- trunk/KDE/kdepim/korganizer/korganizer_configtime.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=korganizer
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=200
Name=Time and Date
Name[ca]=Hora i data
--- trunk/KDE/kdepim/korganizer/korganizer_configviews.desktop #813515:813516
@@ -10,6 +10,7 @@
X-KDE-ParentApp=korganizer
X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
X-KDE-CfgDlgHierarchy=KOrganizer
+X-KDE-Weight=300
Name=Views
Name[af]=Aansigte
_______________________________________________
Knode-devel mailing list
Knode-devel@kde.org
https://mail.kde.org/mailman/listinfo/knode-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic