Hello community, here is the log from the commit of package kdebase3 checked in at Thu May 18 18:53:28 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-05-10 16:19:14.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-05-17 16:57:52.000000000 +0200 @@ -1,0 +2,39 @@ +Mon May 15 17:14:14 CEST 2006 - stbinner@suse.de + +- update to KDE 3.5.2 and 3_5_BRANCH.diff + * Klipper + - Handle URLs as URLs and not as Text (bug #121114) + - Prevent crashes caused by corrupted history (bug #109161) + - XFixes support (especially helps with broken clipboard + implementations of some non-KDE applications) (bug #101087) + - Images are ignored by default, add 'IgnoreImages=false' to + '[General]' in klipperrc (bug #109032) + - Avoid repeated action popup with the same URL with some + non-KDE applications with broken clipboard implementations + * Konsole + - Correct issue where history size is unlimited when dealing + with History options in profiles (bug #120046) + - Correctly set Tab bar when set to Dynamic Hide after + session restore (bug #121688) + * Country settings + - Fix short date format for Switzerland (bug #122574) + - Fix address format (especially P.O. Box) for Switzerland + * KSysGuard + - Show the sensors with values of more than two digits + correctly in the applet + * Kicker + - Connect the applications to systray correctly on startup + - Panels properly reserve space at screen edges even for + differently sized Xinerama screens (bug #94470) + * Konqueror + - Resolve symlinks only on the desktop (bug #63014) + * KWin + - Added new window-specific rules for OpenOffice.org, XV and + Mozilla family applications for turning off focus stealing + prevention, as these applications don't work well with it + - Reverted a workaround that as a side-effect had broken + systray docking of some applications (bug #100177) + - Each virtual desktop has a separate focus chain (bug #33701) + * KDesktop + - Fixed stacking of some dialogs (bug #89951,bug #113556) +------------------------------------------------------------------- @@ -3420 +3459 @@ -- show currency symbol/Euro(€) in kcontrol font dialog +- show currency symbol/Euro() in kcontrol font dialog Old: ---- 04_startup_phases_kdebase.patch 07_09_wallpaper_opts.patch 08_wallpaper_less_flicker.patch 3_5_BRANCH_fix-kded-hang-with-nfs.diff 3_5_BRANCH_kicker_147941.diff 3_5_BRANCH_kicker_155339.diff fix-configure-checks.patch kcm_kio-no-error.diff kcontrol-lookandfeel.diff kdebase-3.5.1.tar.bz2 kdesktop-busy-cursor.diff kdm-always-reinit-pam.diff kdm-ignore-unresolvable-hosts.diff kdm-use-latest-samba.diff khelpcenter-fix-docbook-indexing.patch klipper-xfixes.diff konsole-history-saving.diff konsole-save-session-crash.diff ksysguard-kill-fix.patch kth_keyboard.diff kwin-firefox-focus.diff mini-cli-parents.diff nsplugin-crash-fix.diff pluginscan-libXt.diff taskbar-size.diff New: ---- kdebase-3.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:07.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase3 (Version 3.5.1) +# spec file for package kdebase3 (Version 3.5.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -36,9 +36,9 @@ Summary: The KDE Core Components BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ -Version: 3.5.1 -Release: 69 -%define kde_version 3.5.1 +Version: 3.5.2 +Release: 5 +%define kde_version 3.5.2 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh Source4: kdebase3.fillup @@ -108,7 +108,6 @@ Patch85: ksmserver-tooltips.diff Patch86: disable-entries-in-gnome.diff Patch88: hide-only-showin-entries.diff -Patch89: 04_startup_phases_kdebase.patch Patch92: kcminit-ignore-arts.diff Patch94: mach_blass.diff Patch994: mach_blass_legacy.diff @@ -125,42 +124,19 @@ Patch116: teach-minicli-lock.diff Patch117: access.diff Patch120: kmenu-search-slowdown-fix.diff -Patch121: 07_09_wallpaper_opts.patch Patch123: less_verbal_kdesu.patch -Patch124: 08_wallpaper_less_flicker.patch Patch125: kicker-defaults.diff Patch126: kdebase_khc_rellinks.diff Patch127: khelpcenter-use-suseconfig-indexer.diff -Patch129: kdesktop-busy-cursor.diff -Patch130: kdm-use-latest-samba.diff Patch131: background_default.diff -Patch132: klipper-xfixes.diff -Patch133: 3_5_BRANCH_kicker_147941.diff -Patch134: nsplugin-crash-fix.diff -Patch135: konsole-history-saving.diff -Patch136: kdm-always-reinit-pam.diff -Patch137: kwin-firefox-focus.diff -Patch138: khelpcenter-fix-docbook-indexing.patch -Patch139: ksysguard-kill-fix.patch -Patch140: kth_keyboard.diff Patch141: khelpcenter-use-susehelp.diff -Patch142: mini-cli-parents.diff -Patch143: kdm-ignore-unresolvable-hosts.diff Patch144: make-wallpapers-hideable.diff Patch145: kdebase_http_offline_mode.diff -Patch146: fix-configure-checks.patch -Patch147: 3_5_BRANCH_kicker_155339.diff Patch148: kdesu-dont-keep-pwd.diff Patch149: kdeeject.diff -Patch150: taskbar-size.diff -Patch151: 3_5_BRANCH_fix-kded-hang-with-nfs.diff -Patch152: kcontrol-lookandfeel.diff -Patch153: konsole-save-session-crash.diff Patch155: use-full-hinting-by-default.diff Patch156: kcmshell_use_kde-sound.diff Patch157: kcmsamba_log.diff -Patch158: kcm_kio-no-error.diff -Patch159: pluginscan-libXt.diff Patch160: khelpcenter-localindices.patch Provides: kdebase @@ -331,7 +307,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 84 +Release: 85 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -370,7 +346,6 @@ cd kioslave/media %patch21 cd ../.. -%patch89 -p1 %patch85 %endif %patch39 @@ -443,44 +418,21 @@ %endif %patch116 %patch117 -%patch121 -p1 %if %suse_version > 1000 %patch123 -%patch124 %patch125 %patch126 -%patch129 -%patch130 %patch131 %patch141 -p1 %endif %patch127 -%patch132 -%patch133 -%patch134 -%patch135 -%patch136 -%patch137 -%patch138 -%patch139 -%patch140 -%patch142 -%patch143 %patch144 %patch145 -%patch146 -%patch147 -p1 %patch148 %patch149 -%patch150 -%patch151 -%patch152 -%patch153 %patch155 %patch156 %patch157 -%patch158 -%patch159 %patch160 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options @@ -620,7 +572,6 @@ %suse_update_desktop_file KControl X-SuSE-core %suse_update_desktop_file konqbrowser WebBrowser %suse_update_desktop_file Kfind System Filesystem core -%suse_update_desktop_file printmgr PrintingUtility %suse_update_desktop_file kinfocenter System Monitor %suse_update_desktop_file kmenuedit Core-Configuration %suse_update_desktop_file konsole TerminalEmulator @@ -1026,7 +977,6 @@ /opt/kde3/share/applnk/System/ScreenSavers/KRandom.desktop /opt/kde3/share/applnk/System/kmenuedit.desktop /opt/kde3/share/appl*/*/keditbookmarks.desktop -/opt/kde3/share/appl*/*/printmgr.desktop /opt/kde3/share/appl*/*/ktip.desktop /opt/kde3/share/appl*/*/kpager.desktop /opt/kde3/share/applnk/konqueror.desktop @@ -1402,6 +1352,43 @@ %endif %changelog -n kdebase3 +* Mon May 15 2006 - stbinner@suse.de +- update to KDE 3.5.2 and 3_5_BRANCH.diff + * Klipper +- Handle URLs as URLs and not as Text (bug #121114) +- Prevent crashes caused by corrupted history (bug #109161) +- XFixes support (especially helps with broken clipboard + implementations of some non-KDE applications) (bug #101087) +- Images are ignored by default, add 'IgnoreImages=false' to + '[General]' in klipperrc (bug #109032) +- Avoid repeated action popup with the same URL with some + non-KDE applications with broken clipboard implementations + * Konsole +- Correct issue where history size is unlimited when dealing + with History options in profiles (bug #120046) +- Correctly set Tab bar when set to Dynamic Hide after + session restore (bug #121688) + * Country settings +- Fix short date format for Switzerland (bug #122574) +- Fix address format (especially P.O. Box) for Switzerland + * KSysGuard +- Show the sensors with values of more than two digits + correctly in the applet + * Kicker +- Connect the applications to systray correctly on startup +- Panels properly reserve space at screen edges even for + differently sized Xinerama screens (bug #94470) + * Konqueror +- Resolve symlinks only on the desktop (bug #63014) + * KWin +- Added new window-specific rules for OpenOffice.org, XV and + Mozilla family applications for turning off focus stealing + prevention, as these applications don't work well with it +- Reverted a workaround that as a side-effect had broken + systray docking of some applications (bug #100177) +- Each virtual desktop has a separate focus chain (bug #33701) + * KDesktop +- Fixed stacking of some dialogs (bug #89951,bug #113556) * Wed May 10 2006 - coolo@suse.de - line break if the message is too long for the screen (#157237) * Tue Apr 25 2006 - wstephenson@suse.de @@ -3073,7 +3060,7 @@ * Wed Apr 18 2001 - adrian@suse.de - switch off --enable-final for axp * Fri Apr 13 2001 - adrian@suse.de -- show currency symbol/Euro(€) in kcontrol font dialog +- show currency symbol/Euro() in kcontrol font dialog * Wed Apr 11 2001 - adrian@suse.de - fix SuSEconfig.kdm2 - fix conflicts in sub packages ++++++ 3_5_BRANCH.diff ++++++ ++++ 37325 lines (skipped) ++++ between KDE/kdebase3/3_5_BRANCH.diff ++++ and kdebase3/3_5_BRANCH.diff ++++++ improve-panelservicemenu-geticonset.diff ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:07.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:07.000000000 +0200 @@ -1,6 +1,6 @@ ---- kicker/kicker/ui/service_mnu.cpp -+++ kicker/kicker/ui/service_mnu.cpp -@@ -419,6 +419,12 @@ +--- kicker/libkicker/global.cpp ++++ kicker/libkicker/global.cpp +@@ -386,6 +386,12 @@ KIcon::ActiveState, 0, true); @@ -13,7 +13,7 @@ // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) -@@ -431,8 +437,14 @@ +@@ -398,8 +404,14 @@ active.convertFromImage(active.convertToImage().smoothScale(20,20)); } ++++++ kdebase-3.5.1.tar.bz2 -> kdebase-3.5.2.tar.bz2 ++++++ KDE/kdebase3/kdebase-3.5.1.tar.bz2 kdebase3/kdebase-3.5.2.tar.bz2 differ: char 11, line 1 ++++++ kdebase_http_offline_mode.diff ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:08.000000000 +0200 @@ -27,7 +27,7 @@ + m_paWorkOffline = new KToggleAction( i18n( "Wor&k Offline" ), 0, this, SLOT( slotWorkOffline() ), actionCollection(), "workOffline" ); + m_paWorkOffline->setChecked( isWorkingOffline() ); + - m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", 0 /*not KStdAccel::find!*/, this, SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); @@ -5309,6 +5314,36 @@ ++++++ kicker-defaults.diff ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:08.000000000 +0200 @@ -1,95 +1,20 @@ -Index: kicker/menuext/system/systemmenu.desktop -================================================================================ ---- kcontrol/kcontrol/KControl.desktop -+++ kcontrol/kcontrol/KControl.desktop -@@ -7,84 +7,6 @@ - Type=Application - DocPath=kcontrol/index.html - X-KDE-StartupNotify=true -- --Name=Control Center --Name[af]=Beheer Sentrum --Name[ar]=٠رÙز اÙتØÙÙ --Name[az]=Ä°darÉ MÉrkÉzi --Name[be]=ЊÑÐœÑÐ°Ñ ÐºÑÑаваМÑÐœÑ --Name[bg]=ÐПМÑÑПлеМ ÑеМÑÑÑ --Name[bn]=àŠšàŠ¿à§àŠšà§àŠ€à§àŠ°àŠ£ àŠà§àŠšà§àŠŠà§àŠ° --Name[br]=Kreizenn ren --Name[bs]=Kontrolni centar --Name[ca]=Centre de control --Name[cs]=Ovládacà centrum --Name[cy]=Canolfan Rheoli --Name[da]=Kontrolcenter --Name[de]=Kontrollzentrum --Name[el]=ÎÎÎœÏÏο ελÎγÏÎ¿Ï --Name[en_GB]=Control Centre --Name[eo]=Stircentro --Name[es]=Centro de control --Name[et]=Juhtimiskeskus --Name[eu]=Kontrol gunea --Name[fa]=٠رکز Ú©Ùتر٠--Name[fi]=Ohjauskeskus --Name[fr]=Centre de configuration de KDE --Name[fy]=Konfiguraasjesintrum --Name[ga]=Lárionad Rialaithe --Name[gl]=Centro de Control --Name[he]=×ך×× ×××§×š× --Name[hi]=à€šà€¿à€¯à€à€€à¥à€°à€£ à€à¥à€à€Šà¥à€° --Name[hr]=Kontrolni centar --Name[hu]=VezérlÅpult --Name[id]=Pusat Kontrol --Name[is]=Stjórnborð --Name[it]=Centro di controllo --Name[ja]=ã³ã³ãããŒã«ã»ã³ã¿ãŒ --Name[km]=áááááááááâááááᶠ--Name[ko]=KDE ì ìŽí --Name[lo]=ສູàºàºàº§àºàºàºžàº¡ --Name[lt]=Valdymo centras --Name[lv]=VadÄ«bas Centrs --Name[mk]=ÐПМÑÑПлеМ ЊеМÑÐ°Ñ --Name[mn]=УЎОÑÐŽÐ°Ñ Ñөв --Name[ms]=Pusat Kawalan --Name[mt]=Äentru tal-Kontroll --Name[nb]=Kontrollsenter --Name[nds]=Kuntrullzentrum --Name[nl]=Configuratiecentrum --Name[nn]=Kontrollsenter --Name[nso]=Bogare bja Taolo --Name[oc]=Centre de control --Name[pa]=àšà©°àšàš°à©àš² àšà©àšàšŠàš° --Name[pl]=Centrum sterowania --Name[pt]=Centro de Controlo --Name[pt_BR]=Centro de Controle --Name[ro]=Centrul de control --Name[ru]=ЊеМÑÑ ÑпÑÐ°Ð²Ð»ÐµÐœÐžÑ --Name[rw]=Kugenzura Hagati --Name[se]=Stivrenguovddáš --Name[sk]=Ovládacie Centrum --Name[sl]=Nadzorno srediÅ¡Äe --Name[sr]=ÐПМÑÑПлМО ÑеМÑÐ°Ñ --Name[sr@Latn]=Kontrolni centar --Name[ss]=Sikhungo sekulawula --Name[sv]=InstÀllningscentralen --Name[ta]=à®à®à¯à®à¯à®ªà¯à®ªà®Ÿà®à¯à®à¯ à®®à¯à®¯à®®à¯ --Name[tg]=ÐаÑказО кПМÑÑПл --Name[th]=àžšàž¹àžàž¢à¹àžàž§àžàžàžžàž¡ --Name[tr]=Kontrol Merkezi --Name[tt]=Ä°dÀrÀ ÃzÀge --Name[uk]=ЊеМÑÑ ÐºÐµÑÑÐ²Ð°ÐœÐœÑ --Name[uz]=ÐПÑÒаÑÑв ЌаÑказО --Name[ven]=Senthara ya vhulanguli --Name[vi]=Trung tâm Äiá»u khiá»n --Name[wa]=Cinte di contrÃŽle --Name[xh]=Umbindi Wolawulo --Name[zh_CN]=æ§å¶äžå¿ --Name[zh_TW]=æ§å¶äžå¿ --Name[zu]=Indawo Yokulawula -- -+Name=Personal Settings - X-DCOP-ServiceType=Unique - Categories=Qt;KDE;Core; ---- kcontrol/kicker/menutab_impl.cpp -+++ kcontrol/kicker/menutab_impl.cpp +Index: kicker/libkicker/kickerSettings.kcfg +=================================================================== +--- kicker/libkicker/kickerSettings.kcfg (Revision 500974) ++++ kicker/libkicker/kickerSettings.kcfg (Arbeitskopie) +@@ -154,7 +154,7 @@ + + <entry name="MenuExtensions" key="Extensions" type="StringList" > + <label>Optional Menus</label> +- <default>prefmenu.desktop,systemmenu.desktop</default> ++ <default>recentdocs.desktop,systemmenu.desktop</default> + </entry> + + <entry name="RecentAppsStat" type="StringList" > +Index: kcontrol/kicker/menutab_impl.cpp +=================================================================== +--- kcontrol/kicker/menutab_impl.cpp (Revision 500974) ++++ kcontrol/kicker/menutab_impl.cpp (Arbeitskopie) @@ -154,10 +154,11 @@ QListViewItem *item(0); for (item = m_subMenus->firstChild(); item; item = item->nextSibling()) @@ -105,70 +30,24 @@ m_showFrequent->setChecked(true); } ---- kicker/libkicker/kickerSettings.kcfg -+++ kicker/libkicker/kickerSettings.kcfg -@@ -159,7 +159,7 @@ - - <entry name="MenuExtensions" key="Extensions" type="StringList" > - <label>Optional Menus</label> -- <default>prefmenu.desktop,systemmenu.desktop</default> -+ <default>recentdocs.desktop,systemmenu.desktop</default> - </entry> - - <entry name="RecentAppsStat" type="StringList" > ---- kicker/menuext/system/systemmenu.desktop -+++ kicker/menuext/system/systemmenu.desktop -@@ -1,52 +1,6 @@ +--- kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:12 1.1 ++++ kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:26 +@@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=System Menu --Name[af]=Stelsel Kieslys --Name[bg]=СОÑÑеЌМП ÐŒÐµÐœÑ --Name[bn]=àŠžàŠ¿àŠžà§àŠà§àŠ® àŠ®à§àŠšà§ --Name[br]=Meuziad ar reizhiad --Name[ca]=Menú de sistema --Name[cs]=Systémová nabÃdka --Name[cy]=Dewislen y Cysawd --Name[da]=Systemmenu --Name[de]=System-MenÃŒ --Name[el]=ÎÎµÎœÎ¿Ï ÏÏ ÏÏήΌαÏÎ¿Ï --Name[es]=Menú del sistema --Name[et]=SÃŒsteemi menÌÌ --Name[eu]=Sistemaren menua --Name[fi]=JÀrjestelmÀvalikko --Name[fr]=Menu du systÚme --Name[fy]=Systeemmenu --Name[ga]=Roghchlár an Chórais --Name[gl]=Sistema --Name[hu]=RendszermenÃŒ --Name[is]=Kerfisvalmynd --Name[it]=Menu di Sistema --Name[ja]=ã·ã¹ãã ã¡ãã¥ãŒ --Name[km]=ááááááááâáááºáá»á --Name[lt]=Sistemos meniu --Name[mk]=СОÑÑеЌÑкП ЌеМО --Name[nb]=Systemmeny --Name[nds]=Systeem-MenÃŒ --Name[nl]=Systeemmenu --Name[nn]=Systemmeny --Name[pa]=àšžàš¿àšžàšàš® àš®à©àššà© --Name[pl]=System --Name[pt]=Menu do Sistema --Name[pt_BR]=Menu Sistema --Name[ru]=СОÑÑеЌа --Name[se]=Vuogádatfállu --Name[sl]=Sistem --Name[sr]=СОÑÑеЌÑкО ЌеМО --Name[sr@Latn]=Sistemski meni --Name[sv]=Systemmeny --Name[tg]=ÐеМÑО ÑОÑÑеЌа --Name[th]=à¹àž¡àžàž¹àž£àž°àžàž --Name[tr]=Sistem MenÃŒsÃŒ --Name[uk]=СОÑÑеЌМе ÐŒÐµÐœÑ --Name[uz]=ТОзОЌ ЌеМÑÑО --Name[zh_CN]=ç³»ç»èå --Name[zh_TW]=系統éžå® +Name=My System - Comment=Menu of important system places - Comment[af]=Kieslys vir belangrike stelsel plekke - Comment[bg]=ÐÐµÐœÑ Ð·Ð° ЎПÑÑÑп ЎП ÑОÑÑеЌМОÑе ЎОÑекÑПÑОО + Name[af]=Stelsel Kieslys + Name[bg]=СОÑÑеЌМП ÐŒÐµÐœÑ + Name[bn]=àŠžàŠ¿àŠžà§àŠà§àŠ® àŠ®à§àŠšà§ +--- kcontrol/kcontrol/KControl.desktop 2006/03/31 11:48:56 1.1 ++++ kcontrol/kcontrol/KControl.desktop 2006/03/31 11:49:16 +@@ -6,7 +6,7 @@ + DocPath=kcontrol/index.html + X-KDE-StartupNotify=true + +-Name=Control Center ++Name=Personal Settings + Name[af]=Beheer Sentrum + Name[ar]=٠رÙز اÙتØÙÙ + Name[az]=Ä°darÉ MÉrkÉzi ++++++ kmenu-search-slowdown-fix.diff ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:08.000000000 +0200 @@ -1,15 +1,5 @@ ---- kicker/kicker/ui/k_mnu.cpp -+++ kicker/kicker/ui/k_mnu.cpp -@@ -775,6 +775,7 @@ - insertSeparator(RecentlyLaunchedApps::the().m_nNumMenuItems); - } - } -+ iconsLoaded_ = false; - } - - void PanelKMenu::clearRecentMenuItems() ---- kicker/kicker/ui/service_mnu.cpp -+++ kicker/kicker/ui/service_mnu.cpp +--- kicker/kicker/ui/service_mnu.cpp 2005/11/25 08:19:25 1.115 ++++ kicker/kicker/ui/service_mnu.cpp 2005/11/25 10:32:36 @@ -63,13 +63,20 @@ insertInlineHeader_( insertInlineHeader ), clearOnClose_(false), @@ -32,7 +22,7 @@ } PanelServiceMenu::~PanelServiceMenu() -@@ -103,6 +110,7 @@ +@@ -103,6 +112,7 @@ clearSubmenus(); searchSubMenuIDs.clear(); searchMenuItems.clear(); @@ -40,11 +30,11 @@ doInitialize(); } -@@ -285,15 +293,13 @@ +@@ -258,15 +268,13 @@ newSubMenu(g->name(), g->relPath(), this, g->name().utf8(), inlineHeaderName); m->setCaption(groupCaption); -- QIconSet iconset = getIconSet(g->icon()); +- QIconSet iconset = KickerLib::menuIconSet(g->icon()); - if (separatorNeeded) { @@ -57,22 +47,7 @@ entryMap_.insert(newId, static_cast<KSycocaEntry*>(g)); // This submenu will be searched when applying a search string searchSubMenuIDs[m] = newId; -@@ -430,18 +436,20 @@ - } - } - -- if (iconset.isNull()) { -- QPixmap pix(iconSize,iconSize); -- QBitmap map(iconSize,iconSize,true); -- pix.setMask(map); -- iconset = QIconSet(pix,pix); -- } -+ if (iconset.isNull()) -+ return emptyiconset; - - return iconset; - } - +@@ -428,5 +428,11 @@ void PanelServiceMenu::configChanged() { + const int iconSize = KickerSettings::menuEntryHeight(); @@ -84,19 +59,19 @@ deinitialize(); } -@@ -498,9 +506,9 @@ +@@ -483,9 +493,9 @@ int newId; if ( label.isEmpty() ) -- newId = insertItem(getIconSet(icon), serviceName, nId, nIndex); +- newId = insertItem(KickerLib::menuIconSet(s->icon()), serviceName, nId, nIndex); + newId = insertItem(emptyiconset, serviceName, nId, nIndex); else -- newId = insertItem(getIconSet(icon), label, nId, nIndex); +- newId = insertItem(KickerLib::menuIconSet(s->icon()), label, nId, nIndex); + newId = insertItem(emptyiconset, label, nId, nIndex); entryMap_.insert(newId, static_cast<KSycocaEntry*>(s)); } -@@ -1024,3 +1032,23 @@ +@@ -1009,3 +1019,23 @@ { return hasSearchResults_; } @@ -110,18 +85,18 @@ + for ( mapIt = entryMap_.begin(); mapIt != entryMap_.end(); ++mapIt ) { + KService *s = dynamic_cast<KService *>(static_cast<KSycocaEntry*>(mapIt.data())); + if (s) -+ changeItem(mapIt.key(),getIconSet(s->icon()),text(mapIt.key())); ++ changeItem(mapIt.key(),KickerLib::menuIconSet(s->icon()),text(mapIt.key())); + else { + KServiceGroup *g = dynamic_cast<KServiceGroup *>(static_cast<KSycocaEntry*>(mapIt.data())); + if (g) -+ changeItem(mapIt.key(),getIconSet(g->icon()),text(mapIt.key())); ++ changeItem(mapIt.key(),KickerLib::menuIconSet(g->icon()),text(mapIt.key())); + } + } + iconsLoaded_ = true; + } +} ---- kicker/kicker/ui/service_mnu.h -+++ kicker/kicker/ui/service_mnu.h +--- kicker/kicker/ui/service_mnu.h 2005/11/25 08:18:55 1.85 ++++ kicker/kicker/ui/service_mnu.h 2005/11/25 10:34:47 @@ -125,9 +125,12 @@ PanelServiceMenuMap searchSubMenuIDs; bool hasSearchResults_; @@ -135,3 +110,13 @@ private: enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu, +--- kicker/kicker/ui/k_mnu.cpp 2005/11/25 08:18:55 1.85 ++++ kicker/kicker/ui/k_mnu.cpp 2005/11/25 10:33:46 +@@ -775,6 +775,7 @@ + insertSeparator(RecentlyLaunchedApps::the().m_nNumMenuItems); + } + } ++ iconsLoaded_ = false; + } + + void PanelKMenu::clearRecentMenuItems() ++++++ less_verbal_kdesu.patch ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:08.000000000 +0200 @@ -1,18 +1,25 @@ ---- kdesu/kdesu/sudlg.cpp -+++ kdesu/kdesu/sudlg.cpp -@@ -20,13 +20,9 @@ +--- kdesu/kdesu/sudlg.cpp 2006/04/20 08:36:56 1.1 ++++ kdesu/kdesu/sudlg.cpp 2006/04/20 08:39:10 +@@ -20,20 +20,9 @@ QString prompt; if (m_User == "root") +- { +- if ( withIgnoreButton ) - prompt = i18n("The action you requested needs root privileges. " -- "Please enter root's password below or click " -- "Ignore to continue with your current privileges."); -+ prompt = i18n("Please enter the Administrator (root) password to continue."); +- "Please enter root's password below or click " +- "Ignore to continue with your current privileges."); +- else +- prompt = i18n("The action you requested needs root privileges. " +- "Please enter root's password below "); +- } +- ++ prompt = i18n("Please enter the Administrator (root) password to continue."); else - prompt = i18n("The action you requested needs additional privileges. " - "Please enter the password for \"%1\" below or click " - "Ignore to continue with your current privileges.").arg(m_User); -+ prompt = i18n("Please enter password for \"%1\" to continue.").arg(m_User); ++ prompt = i18n("Please enter password for \"%1\" to continue.").arg(m_User); setPrompt(prompt); - setButtonText(User1, i18n("&Ignore")); + if( withIgnoreButton ) ++++++ mach_blass.diff ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:08.000000000 +0200 @@ -1,10 +1,11 @@ ---- ksmserver/shutdowndlg.cpp -+++ ksmserver/shutdowndlg.cpp +diff -ru ksmserver-tt/shutdowndlg.cpp ksmserver/shutdowndlg.cpp +--- ksmserver-tt/shutdowndlg.cpp 2005-11-22 17:22:02.000000000 +0100 ++++ ksmserver/shutdowndlg.cpp 2005-11-22 20:21:04.000000000 +0100 @@ -34,6 +34,7 @@ #include <kuser.h> #include <kpixmap.h> - #include <kpixmapeffect.h> -+#include <kimageeffect.h> + #include <kimageeffect.h> ++#include <kpixmapeffect.h> #include <kdialog.h> #include <kseparator.h> @@ -18,7 +19,7 @@ KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L; KSMShutdownFeedback::KSMShutdownFeedback() -@@ -54,31 +58,92 @@ +@@ -54,33 +58,92 @@ m_currentY( 0 ) { setBackgroundMode( QWidget::NoBackground ); @@ -43,10 +44,25 @@ + passed.start(); + if ( m_currentY >= height() ) { +- if ( backgroundMode() == QWidget::NoBackground ) { +- setBackgroundMode( QWidget::NoBackground ); +- setBackgroundPixmap( m_root ); +- } + slotPaintEffect(); -+ return; -+ } -+ + return; + } + +- KPixmap pixmap; +- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ); +- QImage image = pixmap.convertToImage(); +- KImageEffect::blend( Qt::black, image, 0.4 ); +- KImageEffect::toGray( image, true ); +- pixmap.convertFromImage( image ); +- bitBlt( this, 0, m_currentY, &pixmap ); +- bitBlt( &m_root, 0, m_currentY, &pixmap ); +- m_currentY += 10; +- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) ); +-} + QImage img; + img = QPixmap::grabWindow( qt_xrootwin(), 0, + m_currentY, width(), @@ -103,30 +119,22 @@ + //kdDebug() << "passed after bitBlt " << passed.elapsed() << endl; + + if ( current_fade >= scale ) { - if ( backgroundMode() == QWidget::NoBackground ) { - setBackgroundMode( QWidget::NoBackground ); -- setBackgroundPixmap( m_root ); ++ if ( backgroundMode() == QWidget::NoBackground ) { ++ setBackgroundMode( QWidget::NoBackground ); + setBackgroundPixmap( copy ); - } - return; - } - -- KPixmap pixmap; -- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ); -- pixmap = KPixmapEffect::fade( pixmap, 0.4, Qt::black ); -- pixmap = KPixmapEffect::toGray( pixmap, true ); -- bitBlt( this, 0, m_currentY, &pixmap ); -- bitBlt( &m_root, 0, m_currentY, &pixmap ); -- m_currentY += 10; -- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) ); --} ++ } ++ return; ++ } ++ + QTimer::singleShot( 0, this, SLOT( slotPaintEffect() ) ); + } ////// ---- ksmserver/shutdowndlg.h -+++ ksmserver/shutdowndlg.h +Nur in ksmserver: shutdowndlg.cpp.orig. +diff -ru ksmserver-tt/shutdowndlg.h ksmserver/shutdowndlg.h +--- ksmserver-tt/shutdowndlg.h 2005-11-22 17:14:12.000000000 +0100 ++++ ksmserver/shutdowndlg.h 2005-11-22 18:29:49.000000000 +0100 @@ -9,7 +9,9 @@ #include <qpixmap.h> ++++++ short-menus.diff ++++++ --- /var/tmp/diff_new_pack.89aObI/_old 2006-05-18 18:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.89aObI/_new 2006-05-18 18:53:08.000000000 +0200 @@ -1,5 +1,5 @@ --- kdesktop/Makefile.am -+++ kdesktop/Makefile.am ++++ kdesktop/Makefile.am 2005/02/08 11:08:16 @@ -6,6 +6,8 @@ SUBDIRS = . lock pics patterns programs init kwebdesktop @@ -9,8 +9,22 @@ ####### Files bin_PROGRAMS = kcheckrunning ---- kicker/kicker/ui/service_mnu.cpp -+++ kicker/kicker/ui/service_mnu.cpp +--- kicker/libkicker/kickerSettings.kcfg.sav 2006-02-10 14:55:12.000000000 +0100 ++++ kicker/libkicker/kickerSettings.kcfg 2006-02-10 14:55:19.000000000 +0100 +@@ -126,6 +126,11 @@ + <default>true</default> + </entry> + ++<entry name="ReduceMenuDepth" type="Bool" > ++ <label>Simplify menus with only a single item inside</label> ++ <default>false</default> ++ </entry> ++ + <entry name="MenuEntryHeight" type="Int" > + <label>Height of menu entries in pixels</label> + <default>0</default> +--- kicker/kicker/ui/service_mnu.cpp.sav 2006-02-10 14:55:12.000000000 +0100 ++++ kicker/kicker/ui/service_mnu.cpp 2006-02-10 15:07:24.000000000 +0100 @@ -111,6 +111,11 @@ QStringList suppressGenericNames = _root->suppressGenericNames(); @@ -85,9 +99,9 @@ + + _list = _root->SuSEsortEntries( slist, glist, excludeNoDisplay_, true ); + it = _list.begin(); - -+ for (; it != _list.end(); ++it) { + ++ for (; it != _list.end(); ++it) { + + KSycocaEntry * e = *it; + + if (e->isType(KST_KServiceGroup)) { @@ -133,7 +147,7 @@ QString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. -@@ -214,7 +304,7 @@ +@@ -214,7 +299,7 @@ } KService::Ptr s(static_cast<KService *>(e)); @@ -142,7 +156,7 @@ } else if (e->isType(KST_KServiceSeparator)) { -@@ -350,7 +440,8 @@ +@@ -350,7 +435,8 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/, const QStringList *suppressGenericNames /* = 0 */, @@ -152,25 +166,25 @@ { QString serviceName = aliasname.isEmpty() ? s->name():aliasname; // add comment -@@ -393,7 +484,15 @@ +@@ -393,7 +479,15 @@ // to accelerators, replace them with two ampersands. serviceName.replace("&", "&&"); -- int newId = insertItem(getIconSet(s->icon()), serviceName, nId, nIndex); +- int newId = insertItem(KickerLib::menuIconSet(s->icon()), serviceName, nId, nIndex); + QString icon = s->icon(); + if (icon=="unknown") + icon = categoryIcon; + + int newId; + if ( label.isEmpty() ) -+ newId = insertItem(getIconSet(icon), serviceName, nId, nIndex); ++ newId = insertItem(KickerLib::menuIconSet(s->icon()), serviceName, nId, nIndex); + else -+ newId = insertItem(getIconSet(icon), label, nId, nIndex); ++ newId = insertItem(KickerLib::menuIconSet(s->icon()), label, nId, nIndex); entryMap_.insert(newId, static_cast<KSycocaEntry*>(s)); } ---- kicker/kicker/ui/service_mnu.h -+++ kicker/kicker/ui/service_mnu.h +--- kicker/kicker/ui/service_mnu.h.sav 2006-02-10 14:55:12.000000000 +0100 ++++ kicker/kicker/ui/service_mnu.h 2006-02-10 14:55:19.000000000 +0100 @@ -83,7 +83,8 @@ protected: void insertMenuItem(KService::Ptr & s, int nId, int nIndex = -1, @@ -181,17 +195,3 @@ virtual PanelServiceMenu * newSubMenu(const QString & label, const QString & relPath, QWidget * parent, const char * name, ---- kicker/libkicker/kickerSettings.kcfg -+++ kicker/libkicker/kickerSettings.kcfg -@@ -126,6 +126,11 @@ - <default>true</default> - </entry> - -+<entry name="ReduceMenuDepth" type="Bool" > -+ <label>Simplify menus with only a single item inside</label> -+ <default>false</default> -+ </entry> -+ - <entry name="MenuEntryHeight" type="Int" > - <label>Height of menu entries in pixels</label> - <default>0</default> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de