Hello community, here is the log from the commit of package kdebase4-workspace checked in at Mon Feb 4 21:24:59 CET 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-02-04 00:40:40.000000000 +0100 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-02-04 21:23:04.663512000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 4 19:39:58 CET 2008 - stbinner@suse.de + +- update to final 4.0.1 tarball +- fix user session switching +- add location option to panel configuration dialog +- remove kinfocenter handbook + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- r769466.diff New: ---- panel-location.diff r769229.diff r770869-switch-user.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.X15270/_old 2008-02-04 21:23:34.000000000 +0100 +++ /var/tmp/diff_new_pack.X15270/_new 2008-02-04 21:23:34.000000000 +0100 @@ -21,7 +21,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.1 -Release: 1 +Release: 3 %define rversion 4.0.1 Source0: kdebase-workspace-%rversion.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +59,11 @@ /usr/share/wallpapers %changelog +* Mon Feb 04 2008 stbinner@suse.de +- update to final 4.0.1 tarball +- fix user session switching +- add location option to panel configuration dialog +- remove kinfocenter handbook * Sun Feb 03 2008 stbinner@suse.de - update to 4.0.1 release - backport of panel size configuration dialog ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.X15270/_old 2008-02-04 21:23:34.000000000 +0100 +++ /var/tmp/diff_new_pack.X15270/_new 2008-02-04 21:23:34.000000000 +0100 @@ -22,7 +22,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.1 -Release: 1 +Release: 3 %define rversion 4.0.1 Source0: kdebase-workspace-%rversion.tar.bz2 Source1: opensuse.png @@ -52,7 +52,9 @@ Patch20: kickoff-app-reset.diff Patch21: simpleapplet.diff Patch22: systemtray.diff -Patch23: r769466.diff +Patch23: r770869-switch-user.diff +Patch24: panel-location.diff +Patch25: r769229.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD Recommends: kdebase4-SuSE @@ -97,6 +99,8 @@ %patch21 %patch22 %patch23 +%patch24 +%patch25 %build %cmake_kde4 -d build @@ -592,7 +596,6 @@ /usr/share/kde4/services/plasma-scriptengine-qscript.desktop /usr/share/kde4/services/plasma-tasks-default.desktop /usr/share/kde4/servicetypes/weather_ion.desktop -%doc %lang(en) /usr/share/doc/kde/HTML/en/kinfocenter %doc %lang(en) /usr/share/doc/kde/HTML/en/klipper %doc %lang(en) /usr/share/doc/kde/HTML/en/kmenuedit %doc %lang(en) /usr/share/doc/kde/HTML/en/ksysguard @@ -611,6 +614,11 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Mon Feb 04 2008 stbinner@suse.de +- update to final 4.0.1 tarball +- fix user session switching +- add location option to panel configuration dialog +- remove kinfocenter handbook * Sun Feb 03 2008 stbinner@suse.de - update to 4.0.1 release - backport of panel size configuration dialog ++++++ kdebase-workspace-4.0.1.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.0.1.tar.bz2 kdebase4-workspace/kdebase-workspace-4.0.1.tar.bz2 differ: byte 11, line 1 ++++++ kickoff-app-reset.diff ++++++ --- /var/tmp/diff_new_pack.X15270/_old 2008-02-04 21:23:34.000000000 +0100 +++ /var/tmp/diff_new_pack.X15270/_new 2008-02-04 21:23:34.000000000 +0100 @@ -3,14 +3,14 @@ --- plasma/applets/kickoff/ui/launcher.h (revision 769443) +++ plasma/applets/kickoff/ui/launcher.h (working copy) @@ -75,7 +75,8 @@ - private Q_SLOTS: void focusSearchView(const QString& query); void showViewContextMenu(const QPoint& pos); + void focusFavoritesView(); void openHomepage(); + void slotCurrentChanged(int); - public Q_SLOTS: - void focusFavoritesView(); + private: + class Private; Index: plasma/applets/kickoff/ui/launcher.cpp =================================================================== --- plasma/applets/kickoff/ui/launcher.cpp (revision 769443) ++++++ kickoff-footer.diff ++++++ --- /var/tmp/diff_new_pack.X15270/_old 2008-02-04 21:23:34.000000000 +0100 +++ /var/tmp/diff_new_pack.X15270/_new 2008-02-04 21:23:34.000000000 +0100 @@ -1,7 +1,5 @@ -Index: plasma/applets/kickoff/ui/launcher.cpp -=================================================================== ---- plasma/applets/kickoff/ui/launcher.cpp (revision 758549) -+++ plasma/applets/kickoff/ui/launcher.cpp (working copy) +--- plasma/applets/kickoff/ui/launcher.cpp ++++ plasma/applets/kickoff/ui/launcher.cpp @@ -18,6 +18,8 @@ Boston, MA 02110-1301, USA. */ @@ -28,7 +26,7 @@ // Local #include "core/favoritesmodel.h" -@@ -62,6 +68,7 @@ +@@ -62,6 +68,7 @@ public: : q(launcher) , urlLauncher(new UrlItemLauncher(launcher)) , searchBar(0) @@ -36,15 +34,15 @@ , contentArea(0) , contentSwitcher(0) , searchView(0) -@@ -233,6 +240,7 @@ +@@ -233,6 +240,7 @@ public: Launcher * const q; UrlItemLauncher *urlLauncher; SearchBar *searchBar; + QWidget *footer; QStackedWidget *contentArea; TabBar *contentSwitcher; - QAbstractItemView *searchView; -@@ -268,6 +276,35 @@ + FlipScrollView *applicationView; +@@ -269,6 +277,35 @@ Launcher::Launcher(QWidget *parent) layout->addWidget(d->contentArea); layout->addWidget(d->contentSwitcher); @@ -80,7 +78,7 @@ setLayout(layout); } -@@ -284,7 +321,7 @@ +@@ -285,7 +322,7 @@ QSize Launcher::sizeHint() const //size.rheight() += 102; size.rheight() = d->searchBar->sizeHint().height() + @@ -89,7 +87,7 @@ ItemDelegate::ITEM_HEIGHT * d->visibleItemCount; return size; -@@ -486,5 +523,11 @@ +@@ -494,5 +531,11 @@ void Launcher::paintEvent(QPaintEvent*) p.drawRect(rect().adjusted(0, 0, -1, -1)); } @@ -101,14 +99,12 @@ + #include "launcher.moc" -Index: plasma/applets/kickoff/ui/launcher.h -=================================================================== ---- plasma/applets/kickoff/ui/launcher.h (revision 758549) -+++ plasma/applets/kickoff/ui/launcher.h (working copy) -@@ -76,6 +76,7 @@ +--- plasma/applets/kickoff/ui/launcher.h ++++ plasma/applets/kickoff/ui/launcher.h +@@ -80,6 +80,7 @@ private Q_SLOTS: void focusSearchView(const QString& query); - void focusFavoritesView(); void showViewContextMenu(const QPoint& pos); + void focusFavoritesView(); + void openHomepage(); private: ++++++ panel-location.diff ++++++ Index: plasma/containments/panel/panel.cpp =================================================================== --- plasma/containments/panel/panel.cpp (revision 770003) +++ plasma/containments/panel/panel.cpp (revision 770004) @@ -389,6 +389,16 @@ l->addWidget(m_sizeEdit, 1, 1); l->setColumnStretch(1,1); connect(m_sizeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(sizeComboChanged())); + + QLabel *locationLabel = new QLabel(i18n("Location:"), p); + l->addWidget(locationLabel, 2, 0); + m_locationCombo = new QComboBox(p); + locationLabel->setBuddy(m_locationCombo); + l->addWidget(m_locationCombo, 2, 1); + m_locationCombo->addItem(i18n("Bottom"), Plasma::BottomEdge); + m_locationCombo->addItem(i18n("Top"), Plasma::TopEdge); + m_locationCombo->addItem(i18n("Right"), Plasma::RightEdge); + m_locationCombo->addItem(i18n("Left"), Plasma::LeftEdge); } int idx = m_sizeCombo->count() - 1; @@ -401,6 +411,14 @@ m_sizeCombo->setCurrentIndex(idx); m_sizeEdit->setValue(m_size); sizeComboChanged(); + idx = 0; + for (int i = 0; i < m_locationCombo->count(); i++) { + if (m_locationCombo->itemData(i).toInt() == location()) { + idx = i; + break; + } + } + m_locationCombo->setCurrentIndex(idx); m_dialog->show(); } @@ -411,6 +429,8 @@ const int size = m_sizeCombo->itemData(m_sizeCombo->currentIndex()).toInt(); m_size = size > 0 ? size : m_sizeEdit->value(); cg.writeEntry("size", m_size); + + setLocation((Plasma::Location)(m_locationCombo->itemData(m_locationCombo->currentIndex()).toInt())); updateConstraints(); } Index: plasma/containments/panel/panel.h =================================================================== --- plasma/containments/panel/panel.h (revision 770003) +++ plasma/containments/panel/panel.h (revision 770004) @@ -57,6 +57,7 @@ KDialog* m_dialog; QComboBox* m_sizeCombo; KIntNumInput* m_sizeEdit; + QComboBox* m_locationCombo; QAction* m_configureAction; bool m_drawTop : 1; bool m_drawLeft : 1; ++++++ r769466.diff -> r769229.diff ++++++ --- KDE/kdebase4-workspace/r769466.diff 2008-02-03 17:00:53.000000000 +0100 +++ kdebase4-workspace/r769229.diff 2008-02-04 19:59:11.000000000 +0100 @@ -1,32 +1,10 @@ -Index: kwin/lib/CMakeLists.txt +Index: doc/CMakeLists.txt =================================================================== ---- kwin/lib/CMakeLists.txt (revision 769465) -+++ kwin/lib/CMakeLists.txt (revision 769466) -@@ -19,7 +19,12 @@ - - ########### install files ############### - --install( FILES kdecoration.h kdecorationfactory.h kcommondecoration.h DESTINATION ${INCLUDE_INSTALL_DIR}) -+install( FILES -+ kdecoration.h -+ kdecorationfactory.h -+ kcommondecoration.h -+ kdecorationbridge.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}) - - ### effects lib ### - set(kwin_EFFECTSLIB_SRCS -@@ -59,5 +64,11 @@ - endif (X11_Xfixes_FOUND) - - --install( FILES kwinglobals.h kwineffects.h ${CMAKE_CURRENT_BINARY_DIR}/kwinconfig.h DESTINATION ${INCLUDE_INSTALL_DIR}) -- -+install( FILES -+ kwinglobals.h -+ kwineffects.h -+ kwinglutils.h -+ kwinglutils_funcs.h -+ kwinshadereffect.h -+ ${CMAKE_CURRENT_BINARY_DIR}/kwinconfig.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}) +--- doc/CMakeLists.txt (revision 769228) ++++ doc/CMakeLists.txt (revision 769229) +@@ -1,5 +1,4 @@ + add_subdirectory(kdm) +-add_subdirectory(kinfocenter) + add_subdirectory(klipper) + add_subdirectory(kmenuedit) + add_subdirectory(ksysguard) ++++++ r770869-switch-user.diff ++++++ Index: krunner/interface.cpp =================================================================== --- krunner/interface.cpp (revision 769904) +++ krunner/interface.cpp (revision 769905) @@ -425,8 +425,8 @@ kDebug() << "Could not find the Sessionrunner; not showing any sessions!"; return; } - - display(); + //TODO: ugh, magic strings. See runners/sessions/sessionrunner.cpp + display("SESSIONS"); m_header->setText(i18n("Switch users")); m_header->setPixmap("system-switch-user"); m_defaultMatch = 0; Index: krunner/runners/sessions/sessionrunner.cpp =================================================================== --- krunner/runners/sessions/sessionrunner.cpp (revision 769904) +++ krunner/runners/sessions/sessionrunner.cpp (revision 769905) @@ -80,7 +80,18 @@ void SessionRunner::exec(Plasma::SearchMatch * action) { if (!action->data().toString().isEmpty()) { - //TODO: implement session switching here! + QString sessionName = action->text(); + DM dm; + SessList sessions; + if (dm.localSessions(sessions)) { + foreach (SessEnt session, sessions) { + if (sessionName == DM::sess2Str(session)) { + dm.lockSwitchVT(session.vt); + break; + } + } + } + return; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org