packages: kde4-kdelibs/kde4-kdelibs-aboutPLD.patch - turn it on, should wor...
shadzik
shadzik at pld-linux.org
Wed May 5 15:39:38 CEST 2010
Author: shadzik Date: Wed May 5 13:39:38 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- turn it on, should work now // untested
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-aboutPLD.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.1 packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.2
--- packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.1 Wed May 5 13:51:16 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch Wed May 5 15:39:32 2010
@@ -130,3 +130,180 @@
/**
* @def KDE_VERSION_MAJOR
+--- kdeui/shortcuts/kstandardshortcut.h.orig 2010-05-05 14:58:12.358756541 +0200
++++ kdeui/shortcuts/kstandardshortcut.h 2010-05-05 14:58:31.331821694 +0200
+@@ -112,6 +112,7 @@
+ SwitchApplicationLanguage,
+ AboutApp,
+ AboutKDE,
++ AboutPLD,
+
+ // Insert new items here!
+
+--- kdeui/shortcuts/kstandardshortcut.cpp.orig 2010-05-05 14:58:54.067833437 +0200
++++ kdeui/shortcuts/kstandardshortcut.cpp 2010-05-05 14:59:31.419907353 +0200
+@@ -177,6 +177,7 @@
+ { SwitchApplicationLanguage, "SwitchApplicationLanguage", I18N_NOOP2("@action", "Switch Application Language"), 0 , 0, KShortcut(), false },
+ { AboutApp , "AboutApp" , I18N_NOOP2("@action", "About Application") , 0 , 0, KShortcut(), false },
+ { AboutKDE , "AboutKDE" , I18N_NOOP2("@action", "About KDE") , 0 , 0, KShortcut(), false },
++ { AboutPLD , "AboutPLD" , I18N_NOOP2("@action", "About PLD Linux") , 0 , 0, KShortcut(), false },
+
+ //dummy entry to catch simple off-by-one errors. Insert new entries before this line.
+ { AccelNone , 0 , 0 , 0 , 0, 0, KShortcut(), false }
+--- kdeui/xmlgui/ui_standards.rc.orig 2010-05-05 14:50:34.884627924 +0200
++++ kdeui/xmlgui/ui_standards.rc 2010-05-05 14:50:55.431088142 +0200
+@@ -189,6 +189,7 @@
+ <MergeLocal name="about_merge"/>
+ <Action name="help_about_app"/>
+ <Action name="help_about_kde"/>
++ <Action name="help_about_pld"/>
+ </Menu>
+ </MenuBar>
+ <ToolBar name="mainToolBar"><text>Main Toolbar</text>
+--- kdeui/widgets/khelpmenu.cpp.orig 2010-05-05 14:41:25.757807484 +0200
++++ kdeui/widgets/khelpmenu.cpp 2010-05-05 15:10:50.251058800 +0200
+@@ -66,18 +66,21 @@
+ mMenu = 0;
+ mAboutApp = 0;
+ mAboutKDE = 0;
++ mAboutPLD = 0;
+ mBugReport = 0;
+ mHandBookAction = 0;
+ mWhatsThisAction = 0;
+ mReportBugAction = 0;
+ mAboutAppAction = 0;
+ mAboutKDEAction = 0;
++ mAboutPLDAction = 0;
+ }
+ ~KHelpMenuPrivate()
+ {
+ delete mMenu;
+ delete mAboutApp;
+ delete mAboutKDE;
++ delete mAboutPLD;
+ delete mBugReport;
+ delete mSwitchApplicationLanguage;
+ }
+@@ -85,6 +88,7 @@
+ KMenu *mMenu;
+ KDialog *mAboutApp;
+ KAboutKdeDialog *mAboutKDE;
++ KAboutPldDialog *mAboutPLD;
+ KBugReport *mBugReport;
+ KSwitchLanguageDialog *mSwitchApplicationLanguage;
+
+@@ -95,7 +99,7 @@
+ bool mShowWhatsThis;
+
+ KAction *mHandBookAction, *mWhatsThisAction;
+- QAction *mReportBugAction, *mSwitchApplicationLanguageAction, *mAboutAppAction, *mAboutKDEAction;
++ QAction *mReportBugAction, *mSwitchApplicationLanguageAction, *mAboutAppAction, *mAboutKDEAction, *mAboutPLDAction;
+
+ const KAboutData *mAboutData;
+ };
+@@ -198,6 +202,11 @@
+ {
+ d->mAboutKDEAction = d->mMenu->addAction( KIcon("kde"), i18n( "About &KDE" ), this, SLOT( aboutKDE() ) );
+ }
++
++ if (KAuthorized::authorizeKAction("help_about_pld"))
++ {
++ d->mAboutPLDAction = d->mMenu->addAction( KIcon("kde"), i18n( "About &PLD Linux" ), this, SLOT( aboutPLD() ) );
++ }
+ }
+
+ return d->mMenu;
+@@ -230,6 +239,10 @@
+ case menuAboutKDE:
+ return d->mAboutKDEAction;
+ break;
++
++ case menuAboutPLD:
++ return d->mAboutPLDAction;
++ break;
+ }
+
+ return 0;
+@@ -297,6 +310,16 @@
+ d->mAboutKDE->show();
+ }
+
++void KHelpMenu::aboutPLD()
++{
++ if( !d->mAboutPLD )
++ {
++ d->mAboutPLD = new KAboutPldDialog( d->mParent );
++ connect( d->mAboutPLD, SIGNAL(finished()), this, SLOT( dialogFinished()) );
++ }
++ d->mAboutPLD->show();
++}
++
+
+ void KHelpMenu::reportBug()
+ {
+@@ -332,6 +355,11 @@
+ {
+ delete d->mAboutKDE; d->mAboutKDE = 0;
+ }
++
++ if( d->mAboutPLD && !d->mAboutPLD->isVisible() )
++ {
++ delete d->mAboutPLD; d->mAboutPLD = 0;
++ }
+
+ if( d->mBugReport && !d->mBugReport->isVisible() )
+ {
+--- kdeui/widgets/khelpmenu.h.orig 2010-05-05 14:48:26.694640649 +0200
++++ kdeui/widgets/khelpmenu.h 2010-05-05 15:12:18.740955287 +0200
+@@ -172,7 +172,8 @@
+ menuAboutApp = 2,
+ menuAboutKDE = 3,
+ menuReportBug = 4,
+- menuSwitchLanguage = 5
++ menuSwitchLanguage = 5,
++ menuAboutPLD = 6
+ };
+
+ /**
+@@ -211,6 +212,7 @@
+ * Opens the standard "About KDE" dialog box.
+ */
+ void aboutKDE();
++ void aboutPLD();
+
+ /**
+ * Opens the standard "Report Bugs" dialog box.
+--- kdeui/actions/kstandardaction_p.h.orig 2010-05-05 14:51:11.624415783 +0200
++++ kdeui/actions/kstandardaction_p.h 2010-05-05 14:53:16.667736408 +0200
+@@ -115,6 +115,7 @@
+ { SwitchApplicationLanguage, KStandardShortcut::SwitchApplicationLanguage, "switch_application_language", I18N_NOOP("Switch Application &Language..."), 0, "preferences-desktop-locale" },
+ { AboutApp, KStandardShortcut::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
+ { AboutKDE, KStandardShortcut::AccelNone, "help_about_kde", I18N_NOOP("About &KDE"), 0, "kde" },
++ { AboutPLD, KStandardShortcut::AccelNone, "help_about_pld", I18N_NOOP("About &PLD Linux"), 0, "pld" },
+ { ActionNone, KStandardShortcut::AccelNone, 0, 0, 0, 0 }
+ };
+
+--- kdeui/actions/kstandardaction.h.orig 2010-05-05 15:06:27.627657333 +0200
++++ kdeui/actions/kstandardaction.h 2010-05-05 15:06:45.712448919 +0200
+@@ -152,7 +152,7 @@
+ Preferences, ConfigureToolbars,
+
+ // Help Menu
+- Help, HelpContents, WhatsThis, ReportBug, AboutApp, AboutKDE,
++ Help, HelpContents, WhatsThis, ReportBug, AboutApp, AboutKDE, AboutPLD,
+ TipofDay,
+
+ // Other standard actions
+--- kdeui/actions/kstandardaction.cpp.orig 2010-05-05 15:06:57.641823233 +0200
++++ kdeui/actions/kstandardaction.cpp 2010-05-05 15:07:42.549109842 +0200
+@@ -627,5 +627,10 @@
+ return KStandardAction::create( AboutKDE, recvr, slot, parent );
+ }
+
++KAction *aboutPLD( const QObject *recvr, const char *slot, QObject *parent )
++{
++ return KStandardAction::create( AboutPLD, recvr, slot, parent );
++}
++
+ }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list