rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-kde#155362.patch, NONE, 1.1 kdebase-workspace.spec, 1.54, 1.55 kdebase-workspace-4.0.2-kde#155362.patch, 1.1, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Fri Mar 28 17:22:55 UTC 2008
- Previous message (by thread): rpms/kdeaccessibility/devel .cvsignore, 1.20, 1.21 kdeaccessibility.spec, 1.43, 1.44 sources, 1.21, 1.22
- Next message (by thread): rpms/kdeadmin/devel .cvsignore, 1.41, 1.42 kdeadmin.spec, 1.86, 1.87 sources, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22160/devel
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.0.3-kde#155362.patch
Removed Files:
kdebase-workspace-4.0.2-kde#155362.patch
Log Message:
* Fri Mar 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
- most of the kde#155362 patch has been merged, keep only the config part
kdebase-workspace-4.0.3-kde#155362.patch:
--- NEW FILE kdebase-workspace-4.0.3-kde#155362.patch ---
Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
===================================================================
--- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 790454)
+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 790453)
@@ -61,7 +61,7 @@
MenuLauncherApplet::FormatType formattype;
KDialog *dialog;
- QComboBox *viewComboBox;
+ QComboBox *viewComboBox, *formatComboBox;
QAction* switcher;
Private() : menuview(0), launcher(0), dialog(0), switcher(0) {}
@@ -203,10 +203,19 @@
d->addItem(d->viewComboBox, i18n("Leave"), MenuLauncherApplet::Leave);
l->addWidget(d->viewComboBox, 0, 1);
+ l->addWidget(new QLabel(i18n("Format:"), p), 1, 0);
+ d->formatComboBox = new QComboBox(p);
+ d->addItem(d->formatComboBox, i18n("Name only"), MenuLauncherApplet::Name);
+ d->addItem(d->formatComboBox, i18n("Description only"), MenuLauncherApplet::Description);
+ d->addItem(d->formatComboBox, i18n("Name Description"), MenuLauncherApplet::NameDescription);
+ d->addItem(d->formatComboBox, i18n("Description (Name)"), MenuLauncherApplet::DescriptionName);
+ l->addWidget(d->formatComboBox, 1, 1);
+
l->setColumnStretch(1,1);
}
d->setCurrentItem(d->viewComboBox, d->viewtype);
+ d->setCurrentItem(d->formatComboBox, d->formattype);
d->dialog->show();
}
@@ -224,6 +233,15 @@
cg.writeEntry("view", QByteArray(e.valueToKey(d->viewtype)));
}
+ int ft = d->formatComboBox->itemData(d->formatComboBox->currentIndex()).toInt();
+ if( ft != d->formattype ) {
+ d->formattype = (MenuLauncherApplet::FormatType) ft;
+ needssaving = true;
+
+ QMetaEnum e = metaObject()->enumerator(metaObject()->indexOfEnumerator("FormatType"));
+ cg.writeEntry("format", QByteArray(e.valueToKey(d->formattype)));
+ }
+
if( needssaving ) {
emit configNeedsSaving();
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdebase-workspace.spec 28 Mar 2008 16:59:46 -0000 1.54
+++ kdebase-workspace.spec 28 Mar 2008 17:22:18 -0000 1.55
@@ -6,7 +6,7 @@
Name: kdebase-workspace
Version: 4.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -20,7 +20,10 @@
# http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
# backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
-Patch100: kdebase-workspace-4.0.2-kde#155362.patch
+# This has been merged into 4.0.3 in http://websvn.kde.org/?view=rev&revision=790059
+# and the config parts reverted in http://websvn.kde.org/?view=rev&revision=790454
+# due to new strings. This patch reverts rev 790454 and restores the full backport.
+Patch100: kdebase-workspace-4.0.3-kde#155362.patch
# upstream patch
@@ -113,7 +116,7 @@
%patch4 -p1 -b .onlyshowkde
# upstream patches
-%patch100 -p1 -b .kde#155362
+%patch100 -p0 -b .kde#155362
%build
@@ -226,6 +229,9 @@
%changelog
+* Fri Mar 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
+- most of the kde#155362 patch has been merged, keep only the config part
+
* Fri Mar 28 2008 Than Ngo <than at redhat.com> 4.0.3-1
- 4.0.3
--- kdebase-workspace-4.0.2-kde#155362.patch DELETED ---
- Previous message (by thread): rpms/kdeaccessibility/devel .cvsignore, 1.20, 1.21 kdeaccessibility.spec, 1.43, 1.44 sources, 1.21, 1.22
- Next message (by thread): rpms/kdeadmin/devel .cvsignore, 1.41, 1.42 kdeadmin.spec, 1.86, 1.87 sources, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list