packages: kde4-kdelibs/kde4-kdelibs-aboutPLD.patch - reorganized, cosmetics...
shadzik
shadzik at pld-linux.org
Wed May 5 23:37:46 CEST 2010
Author: shadzik Date: Wed May 5 21:37:46 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- reorganized, cosmetics, works
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-aboutPLD.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.4 packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.5
--- packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.4 Wed May 5 21:43:57 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch Wed May 5 23:37:41 2010
@@ -1,5 +1,84 @@
---- kdeui/dialogs/kaboutkdedialog_p.cpp.orig 2010-05-05 11:13:06.245960867 +0200
-+++ kdeui/dialogs/kaboutkdedialog_p.cpp 2010-05-05 21:40:59.558623432 +0200
+diff -ru kdelibs-4.4.3/CMakeLists.txt kdelibs-4.4.3-bs/CMakeLists.txt
+--- kdelibs-4.4.3/CMakeLists.txt 2010-04-29 21:52:27.000000000 +0200
++++ kdelibs-4.4.3-bs/CMakeLists.txt 2010-05-05 15:09:15.709513497 +0200
+@@ -13,6 +13,7 @@
+ set (KDE_VERSION_RELEASE 3)
+ set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
+ set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.4.3)")
++exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE PLD_VERSION_STRING)
+
+ set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )
+
+diff -ru kdelibs-4.4.3/CreateKDELibsDependenciesFile.cmake kdelibs-4.4.3-bs/CreateKDELibsDependenciesFile.cmake
+--- kdelibs-4.4.3/CreateKDELibsDependenciesFile.cmake 2010-03-26 18:24:35.000000000 +0100
++++ kdelibs-4.4.3-bs/CreateKDELibsDependenciesFile.cmake 2010-05-05 15:09:16.247343933 +0200
+@@ -12,6 +12,7 @@
+ set(KDE_VERSION_RELEASE ${KDE_VERSION_RELEASE})
+ set(KDE_VERSION \"${KDE_VERSION}\")
+ set(KDE_VERSION_STRING \"${KDE_VERSION_STRING}\")
++set(PLD_VERSION_STRING \"${PLD_VERSION_STRING}\")
+ set(KDE_DEFAULT_HOME \"${KDE_DEFAULT_HOME}\")
+ ")
+
+diff -ru kdelibs-4.4.3/kdecore/util/kdeversion.h.cmake kdelibs-4.4.3-bs/kdecore/util/kdeversion.h.cmake
+--- kdelibs-4.4.3/kdecore/util/kdeversion.h.cmake 2008-12-04 09:35:58.000000000 +0100
++++ kdelibs-4.4.3-bs/kdecore/util/kdeversion.h.cmake 2010-05-05 15:09:16.455263079 +0200
+@@ -45,6 +45,7 @@
+ * (Fictional) example: "4.0.90 (>=20070101)"
+ */
+ #cmakedefine KDE_VERSION_STRING "@KDE_VERSION_STRING@"
++#cmakedefine PLD_VERSION_STRING "@PLD_VERSION_STRING@"
+
+ /**
+ * @def KDE_VERSION_MAJOR
+diff -ru kdelibs-4.4.3/kdeui/actions/kstandardaction.cpp kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.cpp
+--- kdelibs-4.4.3/kdeui/actions/kstandardaction.cpp 2009-08-20 04:43:45.000000000 +0200
++++ kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.cpp 2010-05-05 15:09:16.556253671 +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 );
++}
++
+ }
+
+diff -ru kdelibs-4.4.3/kdeui/actions/kstandardaction.h kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.h
+--- kdelibs-4.4.3/kdeui/actions/kstandardaction.h 2008-11-28 16:40:11.000000000 +0100
++++ kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.h 2010-05-05 22:03:14.724018651 +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
+@@ -578,6 +578,7 @@
+ * Display the About KDE dialog.
+ */
+ KDEUI_EXPORT KAction *aboutKDE(const QObject *recvr, const char *slot, QObject *parent);
++ KDEUI_EXPORT KAction *aboutPLD(const QObject *recvr, const char *slot, QObject *parent);
+ }
+
+ #endif // KSTDACTION_H
+diff -ru kdelibs-4.4.3/kdeui/actions/kstandardaction_p.h kdelibs-4.4.3-bs/kdeui/actions/kstandardaction_p.h
+--- kdelibs-4.4.3/kdeui/actions/kstandardaction_p.h 2009-07-28 21:44:10.000000000 +0200
++++ kdelibs-4.4.3-bs/kdeui/actions/kstandardaction_p.h 2010-05-05 15:09:16.555253800 +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 }
+ };
+
+diff -ru kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.cpp kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.cpp
+--- kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.cpp 2009-11-13 11:59:17.000000000 +0100
++++ kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.cpp 2010-05-05 23:26:14.340239898 +0200
@@ -146,6 +146,64 @@
setMainWidget(mainWidget);
}
@@ -14,7 +93,7 @@
+ KTitleWidget *titleWidget = new KTitleWidget(this);
+ titleWidget->setText(i18n("<html><font size=\"5\">PLD Linux</font><br /><b>%1</b></html>",
+ QString(PLD_VERSION_STRING)));
-+ // titleWidget->setPixmap(KIcon("kde").pixmap(48), KTitleWidget::ImageLeft);
++ titleWidget->setPixmap(KIcon("pld_czarny").pixmap(48), KTitleWidget::ImageLeft);
+
+ QLabel *about = new QLabel;
+ about->setMargin(10);
@@ -26,8 +105,8 @@
+ "<p>Unlike other big distributions, there is no commercial support behind PLD Linux."
+ "The developer community consists of various enthusiasts who wish to donate their time"
+ "and knowledge for the common good of PLD Linux. There is no specific ideology behind PLD-Linux,"
-+ "we just want to have a fast, stable and flexible environment to work in."
-+ "<a href=\"http://www.pld-linux.org\">Read more on the official website...</a>.</p></html>"));
++ "we just want to have a fast, stable and flexible environment to work in.<br/>"
++ "<a href=\"http://www.pld-linux.org\">Read more on the official website...</a>.</p></html>"));
+
+ QLabel *report = new QLabel;
+ report->setMargin(10);
@@ -36,7 +115,7 @@
+ report->setOpenExternalLinks(true);
+ report->setTextInteractionFlags(Qt::TextBrowserInteraction);
+ report->setText(i18n("<html>"
-+ "Please report any PLD Linux related bugs on our Bug Tracking System"
++ "Please report any PLD Linux related bugs on our Bug Tracking System at<br/>"
+ "<a href=\"https://bugs.launchpad.net/pld-linux\">https://bugs.launchpad.net/pld-linux</a></html>" ));
+
+ QTabWidget *tabWidget = new QTabWidget;
@@ -44,11 +123,11 @@
+ tabWidget->addTab(about, i18nc("About PLD Linux","&About"));
+ tabWidget->addTab(report, i18n("&Report Bugs or Wishes"));
+
-+ //QLabel *image = new QLabel;
-+ //image->setPixmap(KStandardDirs::locate("data", "kdeui/pics/aboutkde.png"));
++ QLabel *image = new QLabel;
++ image->setPixmap(KStandardDirs::locate("data", "kdeui/pics/pld_box.png"));
+
+ QHBoxLayout *midLayout = new QHBoxLayout;
-+ //midLayout->addWidget(image);
++ midLayout->addWidget(image);
+ midLayout->addWidget(tabWidget);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -65,8 +144,9 @@
}
#include "kaboutkdedialog_p.moc"
---- kdeui/dialogs/kaboutkdedialog_p.h.orig 2010-05-05 11:14:05.095718495 +0200
-+++ kdeui/dialogs/kaboutkdedialog_p.h 2010-05-05 13:09:25.838373216 +0200
+diff -ru kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.h kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.h
+--- kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.h 2008-05-21 13:08:22.000000000 +0200
++++ kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.h 2010-05-05 15:09:15.708512159 +0200
@@ -61,6 +61,20 @@
Q_DISABLE_COPY( KAboutKdeDialog )
};
@@ -88,38 +168,20 @@
}
#endif
---- CMakeLists.txt.orig 2010-05-05 12:20:50.135526490 +0200
-+++ CMakeLists.txt 2010-05-05 12:30:18.529010371 +0200
-@@ -13,6 +13,7 @@
- set (KDE_VERSION_RELEASE 3)
- set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
- set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.4.3)")
-+exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE PLD_VERSION_STRING)
-
- set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )
-
---- CreateKDELibsDependenciesFile.cmake.orig 2010-05-05 13:12:04.609544437 +0200
-+++ CreateKDELibsDependenciesFile.cmake 2010-05-05 13:12:41.791673182 +0200
-@@ -12,6 +12,7 @@
- set(KDE_VERSION_RELEASE ${KDE_VERSION_RELEASE})
- set(KDE_VERSION \"${KDE_VERSION}\")
- set(KDE_VERSION_STRING \"${KDE_VERSION_STRING}\")
-+set(PLD_VERSION_STRING \"${PLD_VERSION_STRING}\")
- set(KDE_DEFAULT_HOME \"${KDE_DEFAULT_HOME}\")
- ")
-
---- kdecore/util/kdeversion.h.cmake.orig 2010-05-05 13:24:17.786407128 +0200
-+++ kdecore/util/kdeversion.h.cmake 2010-05-05 13:24:47.042078321 +0200
-@@ -45,6 +45,7 @@
- * (Fictional) example: "4.0.90 (>=20070101)"
- */
- #cmakedefine KDE_VERSION_STRING "@KDE_VERSION_STRING@"
-+#cmakedefine PLD_VERSION_STRING "@PLD_VERSION_STRING@"
+diff -ru kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.cpp kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.cpp
+--- kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.cpp 2009-11-21 10:45:18.000000000 +0100
++++ kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.cpp 2010-05-05 15:09:16.553338149 +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 },
- /**
- * @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
+ //dummy entry to catch simple off-by-one errors. Insert new entries before this line.
+ { AccelNone , 0 , 0 , 0 , 0, 0, KShortcut(), false }
+diff -ru kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.h kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.h
+--- kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.h 2009-02-04 19:21:03.000000000 +0100
++++ kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.h 2010-05-05 15:09:16.553338149 +0200
@@ -112,6 +112,7 @@
SwitchApplicationLanguage,
AboutApp,
@@ -128,28 +190,9 @@
// 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
+diff -ru kdelibs-4.4.3/kdeui/widgets/khelpmenu.cpp kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.cpp
+--- kdelibs-4.4.3/kdeui/widgets/khelpmenu.cpp 2008-12-04 09:36:05.000000000 +0100
++++ kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.cpp 2010-05-05 22:59:05.491267064 +0200
@@ -66,18 +66,21 @@
mMenu = 0;
mAboutApp = 0;
@@ -189,19 +232,27 @@
const KAboutData *mAboutData;
};
-@@ -198,6 +202,11 @@
+@@ -127,6 +131,7 @@
+ actions->addAction(KStandardAction::SwitchApplicationLanguage, this, SLOT(switchApplicationLanguage()));
+ actions->addAction(KStandardAction::AboutApp, this, SLOT(aboutApplication()));
+ actions->addAction(KStandardAction::AboutKDE, this, SLOT(aboutKDE()));
++ actions->addAction(KStandardAction::AboutPLD, this, SLOT(aboutPLD()));
+ }
+ }
+
+@@ -198,6 +203,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() ) );
++ d->mAboutPLDAction = d->mMenu->addAction( KIcon("kde"), i18n( "About PLD Linux" ), this, SLOT( aboutPLD() ) );
+ }
}
return d->mMenu;
-@@ -230,6 +239,10 @@
+@@ -230,6 +240,10 @@
case menuAboutKDE:
return d->mAboutKDEAction;
break;
@@ -212,7 +263,7 @@
}
return 0;
-@@ -297,6 +310,16 @@
+@@ -297,6 +311,16 @@
d->mAboutKDE->show();
}
@@ -229,7 +280,7 @@
void KHelpMenu::reportBug()
{
-@@ -332,6 +355,11 @@
+@@ -332,6 +356,11 @@
{
delete d->mAboutKDE; d->mAboutKDE = 0;
}
@@ -241,8 +292,9 @@
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
+diff -ru kdelibs-4.4.3/kdeui/widgets/khelpmenu.h kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.h
+--- kdelibs-4.4.3/kdeui/widgets/khelpmenu.h 2009-07-28 21:44:12.000000000 +0200
++++ kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.h 2010-05-05 15:09:16.555253800 +0200
@@ -172,7 +172,8 @@
menuAboutApp = 2,
menuAboutKDE = 3,
@@ -261,37 +313,14 @@
/**
* 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 );
-+}
-+
- }
-
+diff -ru kdelibs-4.4.3/kdeui/xmlgui/ui_standards.rc kdelibs-4.4.3-bs/kdeui/xmlgui/ui_standards.rc
+--- kdelibs-4.4.3/kdeui/xmlgui/ui_standards.rc 2009-10-02 16:55:18.000000000 +0200
++++ kdelibs-4.4.3-bs/kdeui/xmlgui/ui_standards.rc 2010-05-05 15:09:16.554264615 +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>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list