Hello community, here is the log from the commit of package kdebase3 checked in at Thu Nov 2 20:22:04 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-10-31 14:55:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-11-02 15:27:24.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 2 15:22:48 CET 2006 - coolo@suse.de + +- don't crash on 8bit displays (#210209) +- don't pollute log/messages with debug (#217035) +- update kdm config patch to fix root login (#208279) +- update ksmserver patch to fix the layout of the logout confirmation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.2d1wcS/_old 2006-11-02 20:21:32.000000000 +0100 +++ /var/tmp/diff_new_pack.2d1wcS/_new 2006-11-02 20:21:32.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 30 +Release: 32 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -368,7 +368,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 159 +Release: 161 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1475,6 +1475,11 @@ %endif %changelog -n kdebase3 +* Thu Nov 02 2006 - coolo@suse.de +- don't crash on 8bit displays (#210209) +- don't pollute log/messages with debug (#217035) +- update kdm config patch to fix root login (#208279) +- update ksmserver patch to fix the layout of the logout confirmation * Tue Oct 31 2006 - dmueller@suse.de - fix kdesu prompt again (#216563) * Tue Oct 31 2006 - coolo@suse.de ++++++ kdm-make_it_cool.diff ++++++ --- /var/tmp/diff_new_pack.2d1wcS/_old 2006-11-02 20:21:35.000000000 +0100 +++ /var/tmp/diff_new_pack.2d1wcS/_new 2006-11-02 20:21:35.000000000 +0100 @@ -1478,3 +1478,19 @@ } else { if (userView) userView->hide(); +Index: kdmpixmap.cpp +=================================================================== +--- kdmpixmap.cpp (Revision 601201) ++++ kdm/kfrontend/themer/kdmpixmap.cpp (Arbeitskopie) +@@ -232,7 +232,11 @@ + } + } else { + if (haveTint || haveAlpha) ++ { + scaledImage = pClass->pixmap.convertToImage(); ++ // enforce rgba values for the later ++ scaledImage = scaledImage.convertDepth( 32 ); ++ } + else + pClass->readyPixmap = pClass->pixmap; + } ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.2d1wcS/_old 2006-11-02 20:21:35.000000000 +0100 +++ /var/tmp/diff_new_pack.2d1wcS/_new 2006-11-02 20:21:35.000000000 +0100 @@ -1,8 +1,8 @@ Index: kdm/config.def =================================================================== ---- kdm/config.def (Revision 581780) -+++ kdm/config.def (Arbeitskopie) -@@ -792,6 +792,21 @@ +--- kdm/config.def.orig ++++ kdm/config.def +@@ -792,6 +792,21 @@ Description: <emphasis>Do not</emphasis> change it, you may interfere with future upgrades and this could result in &kdm; failing to run. @@ -24,7 +24,7 @@ Key: PAMService If: defined(USE_PAM) Type: string -@@ -874,10 +889,10 @@ +@@ -874,10 +889,10 @@ Description: Key: PidFile Type: string @@ -38,7 +38,7 @@ Comment: Where &kdm; should store its PID (do not store if empty). Description: -@@ -901,10 +916,10 @@ +@@ -901,10 +916,10 @@ Description: Key: AuthDir Type: path # differs from XDM @@ -52,7 +52,7 @@ Comment: Where to store authorization files. Description: -@@ -930,7 +945,7 @@ +@@ -930,7 +945,7 @@ Description: Key: ExportList Type: list @@ -61,7 +61,7 @@ User: core Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_List) -@@ -1063,9 +1078,10 @@ +@@ -1063,9 +1078,10 @@ Description: Key: Enable Type: bool @@ -73,7 +73,7 @@ Comment: & Description: Whether &kdm; should listen to incoming &XDMCP; requests. -@@ -1102,11 +1118,10 @@ +@@ -1102,11 +1118,10 @@ Description: Key: Xaccess Type: string # differs from xdm @@ -88,7 +88,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: -@@ -1164,13 +1179,11 @@ +@@ -1164,13 +1179,11 @@ Description: Key: Willing Type: string @@ -104,7 +104,7 @@ Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. -@@ -1244,7 +1257,7 @@ +@@ -1244,7 +1257,7 @@ Type: enum None/BO_NONE: no boot manager Grub/BO_GRUB: Grub boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) @@ -113,7 +113,7 @@ User: core User: greeter Instance: #Grub -@@ -1347,6 +1360,7 @@ +@@ -1347,6 +1360,7 @@ Default: DEF_SERVER_CMD DDefault: - User: core Instance: :*/DEF_SERVER_CMD @@ -121,7 +121,7 @@ Comment: The command line to start the &X-Server;, without display number and VT spec. This string is subject to word splitting. -@@ -1355,7 +1369,7 @@ +@@ -1355,7 +1369,7 @@ Description: This string is subject to word splitting. </para><para> The default is something reasonable for the system on which &kdm; was built, @@ -130,7 +130,7 @@ Key: ServerArgsLocal Type: string -@@ -1549,11 +1563,10 @@ +@@ -1549,11 +1563,10 @@ Description: Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -144,7 +144,7 @@ Comment: Specify a file with X-resources for the greeter, chooser and background. The KDE frontend does not use this file, so you do not need it unless you -@@ -1581,12 +1594,11 @@ +@@ -1581,12 +1594,11 @@ Description: Key: Setup Type: string @@ -159,7 +159,7 @@ Comment: A program to run before the greeter is shown. Can be used to start an xconsole or an alternative background generator. Subject to word splitting. -@@ -1602,12 +1614,11 @@ +@@ -1602,12 +1614,11 @@ Description: Key: Startup Type: string @@ -174,7 +174,7 @@ Comment: A program to run before a user session starts. Subject to word splitting. Description: -@@ -1620,12 +1631,11 @@ +@@ -1620,12 +1631,11 @@ Description: Key: Reset Type: string @@ -189,7 +189,7 @@ Comment: A program to run after a user session exits. Subject to word splitting. Description: -@@ -1638,12 +1648,12 @@ +@@ -1638,12 +1648,12 @@ Description: Key: Session Type: string @@ -204,7 +204,21 @@ Comment: The program which is run as the user which logs in. It is supposed to interpret the session argument (see SessionsDirs) and start an appropriate -@@ -1764,6 +1774,7 @@ +@@ -1746,10 +1756,11 @@ Description: + + Key: AllowRootLogin + Type: bool +-Default: true ++Default: false + User: core + User: greeter(showRoot) +-Instance: */false ++Instance: #*/false ++Update: reset_sec_1_2 + Merge: xdm + Comment: + Allow root logins? +@@ -1764,6 +1775,7 @@ User: core # sensible? Instance: */false Instance: :*/true @@ -212,7 +226,7 @@ Merge: xdm Comment: Allow to log in, when user has set an empty password? -@@ -1779,8 +1790,9 @@ +@@ -1779,8 +1791,9 @@ Default: All User: core User: greeter Instance: */Root @@ -224,7 +238,7 @@ Comment: & Description: Who is allowed to shut down the system. This applies both to the -@@ -1857,6 +1869,7 @@ +@@ -1866,6 +1879,7 @@ Type: bool Default: false User: dep Instance: #:0/true @@ -232,7 +246,7 @@ Comment: & Description: Enable automatic login. <emphasis>Use with extreme care!</emphasis> -@@ -1890,7 +1903,7 @@ +@@ -1899,7 +1913,7 @@ Default: "" PostProc: PautoLoginX User: core(autoUser) User: greeter @@ -241,7 +255,7 @@ Merge: xdm:autoUser(P_autoUser) Comment: & Description: -@@ -1921,10 +1934,10 @@ +@@ -1930,10 +1944,10 @@ Description: Key: SessionsDirs Type: list @@ -254,7 +268,7 @@ Comment: The directories containing session type definitions in .desktop format. Description: -@@ -1999,7 +2012,8 @@ +@@ -2008,7 +2022,8 @@ Type: enum Clock/LOGO_CLOCK: a neat analog clock Default: Clock User: greeter @@ -264,7 +278,7 @@ Comment: What should be shown in the greeter's logo are: Description: -@@ -2214,7 +2228,7 @@ +@@ -2223,7 +2238,7 @@ Description: Key: HiddenUsers Type: list @@ -273,7 +287,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID -@@ -2354,13 +2368,14 @@ +@@ -2363,13 +2378,14 @@ Type: enum Default: OneStar User: greeter Instance: #*/NoEcho @@ -289,7 +303,7 @@ User: greeter Instance: #*/! Comment: -@@ -2498,6 +2513,7 @@ +@@ -2507,6 +2523,7 @@ Type: bool Default: false User: greeter Instance: :0/true @@ -297,7 +311,7 @@ Comment: Enable &kdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. -@@ -2586,9 +2602,10 @@ +@@ -2595,9 +2612,10 @@ Description: Key: Preloader Type: string @@ -310,7 +324,7 @@ Comment: & Description: A program to run while the greeter is visible. It is supposed to preload -@@ -2597,7 +2614,7 @@ +@@ -2606,7 +2624,7 @@ Description: Key: UseTheme Type: bool @@ -319,7 +333,7 @@ User: greeter Instance: #*/true Comment: & -@@ -2606,9 +2623,10 @@ +@@ -2615,9 +2633,10 @@ Description: Key: Theme Type: string @@ -334,9 +348,9 @@ The theme to use for the greeter. Can point to either a directory or an XML Index: kdm/kfrontend/read_sysconfig.sh =================================================================== ---- kdm/kfrontend/read_sysconfig.sh (Revision 0) -+++ kdm/kfrontend/read_sysconfig.sh (Revision 0) -@@ -0,0 +1,138 @@ +--- /dev/null ++++ kdm/kfrontend/read_sysconfig.sh +@@ -0,0 +1,145 @@ +#!/bin/bash +# +# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany. @@ -446,12 +460,19 @@ + echo "NoPassEnable=false" + echo "NoPassAllUsers=false" +fi ++ ++echo "[X-:*-Core]" +echo "AllowShutdown=${DISPLAYMANAGER_SHUTDOWN}" +echo "AllowRootLogin=${ALLOW_ROOT_LOGIN}" +echo "AllowNullPasswd=${ALLOW_ROOT_LOGIN}" + +echo "[X-*-Core]" -+echo "EchoMode=${ECHO_MODE}" ++ ++if test "$DISPLAYMANAGER_ROOT_LOGIN_REMOTE" = "yes"; then ++ echo "AllowRootLogin=true" ++else ++ echo "AllowRootLogin=false" ++fi + +case "$DISPLAYMANAGER_XSERVER" in + Xgl) @@ -477,9 +498,9 @@ + Index: kdm/kfrontend/kdm_config.c =================================================================== ---- kdm/kfrontend/kdm_config.c (Revision 581780) -+++ kdm/kfrontend/kdm_config.c (Arbeitskopie) -@@ -386,7 +386,7 @@ +--- kdm/kfrontend/kdm_config.c.orig ++++ kdm/kfrontend/kdm_config.c +@@ -386,7 +386,7 @@ static const char *kdmrc = KDMCONF "/kdm static Section *rootsec; static void @@ -488,26 +509,24 @@ { const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass; char *s, *e, *st, *en, *ek, *sl, *pt; -@@ -396,16 +396,11 @@ +@@ -396,14 +396,9 @@ ReadConf() int nlen, dlen, clen, dhostl, dnuml, dclassl; int i, line, sectmoan, restl; File file; - static int confread; - if (confread) +- return; +- confread = 1; +- +- Debug( "reading config %s ...\n", kdmrc ); +- if (!readFile( &file, kdmrc, "master configuration" )) + Debug( "reading config %s ...\n", rcfile ); + if (!readFile( &file, rcfile, "master configuration" )) return; -- confread = 1; -- Debug( "reading config %s ...\n", kdmrc ); -- if (!readFile( &file, kdmrc, "master configuration" )) -- return; -- for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { - line++; - -@@ -429,7 +424,7 @@ +@@ -429,7 +424,7 @@ ReadConf() e--; if (*e != ']') { cursec = 0; @@ -516,7 +535,7 @@ continue; } nstr = sl + 1; -@@ -439,7 +434,7 @@ +@@ -439,7 +434,7 @@ ReadConf() !memcmp( nstr, cursec->name, nlen )) { LogInfo( "Multiple occurrences of section [%.*s] in %s. " @@ -525,7 +544,7 @@ goto secfnd; } if (nstr[0] == 'X' && nstr[1] == '-') { -@@ -495,7 +490,7 @@ +@@ -495,7 +490,7 @@ ReadConf() illsec: cursec = 0; LogError( "Unrecognized section name [%.*s] at %s:%d\n", @@ -534,7 +553,7 @@ continue; newsec: if (!(cursec = Malloc( sizeof(*cursec) ))) -@@ -523,7 +518,7 @@ +@@ -523,7 +518,7 @@ ReadConf() if (!cursec) { if (sectmoan) { sectmoan = 0; @@ -543,7 +562,7 @@ } goto sktoeol; } -@@ -531,13 +526,13 @@ +@@ -531,13 +526,13 @@ ReadConf() for (; (s < file.eof) && (*s != '\n'); s++) if (*s == '=') goto haveeq; @@ -559,7 +578,7 @@ goto sktoeol; } if (!isspace( *ek )) -@@ -551,7 +546,7 @@ +@@ -551,7 +546,7 @@ ReadConf() if (*s == '\\') { s++; if (s >= file.eof || *s == '\n') { @@ -568,7 +587,7 @@ break; } switch (*s) { -@@ -580,29 +575,42 @@ +@@ -580,29 +575,42 @@ ReadConf() goto keyok; } LogError( "Unrecognized key '%.*s' in section [%.*s] at %s:%d\n", @@ -618,27 +637,26 @@ { Index: kdm/kfrontend/genkdmconf.c =================================================================== ---- kdm/kfrontend/genkdmconf.c (Revision 581780) -+++ kdm/kfrontend/genkdmconf.c (Arbeitskopie) -@@ -66,6 +66,7 @@ +--- kdm/kfrontend/genkdmconf.c.orig ++++ kdm/kfrontend/genkdmconf.c +@@ -66,6 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fi #define stringify(x) __stringify(x) #define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR) -+#define SUSERCVERSTR "1" ++#define SUSERCVERSTR "2" static int old_scripts, no_old_scripts, old_confs, no_old, no_backup, no_in_notice, use_destdir, mixed_scripts; -@@ -73,8 +74,8 @@ +@@ -73,7 +74,7 @@ static const char *newdir = KDMCONF, *fa *oldxdm, *oldkde; static int oldver; +- +static int oldsusever; -- typedef struct StrList { struct StrList *next; - const char *str; -@@ -462,6 +463,7 @@ +@@ -462,6 +463,7 @@ wrconf( FILE *f ) const char *cmt; putfqval( "General", "ConfigVersion", RCVERSTR ); @@ -646,14 +664,24 @@ for (cs = config; cs; cs = cs->next) { fprintf( f, "%s[%s]\n", cs->comment ? cs->comment : "\n", cs->name ); -@@ -1363,6 +1365,16 @@ +@@ -1363,6 +1365,26 @@ upd_consolettys( Entry *ce, Section *cs } #endif +static void +reset_sec_0_1( Entry *ce, Section *cs ATTR_UNUSED ) +{ -+ if (oldsusever == 0 || !ce->written ) ++ if (oldsusever < 1 || !ce->written ) ++ { ++ ce->active = 0; ++ } ++ return; ++} ++ ++static void ++reset_sec_1_2( Entry *ce, Section *cs ATTR_UNUSED ) ++{ ++ if (oldsusever < 2 || !ce->written ) + { + ce->active = 0; + } @@ -663,7 +691,7 @@ #ifdef XDMCP static void cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED ) -@@ -2228,7 +2240,7 @@ +@@ -2228,7 +2250,7 @@ static int mergeKdmRcNewer( const char *path ) { char *p; @@ -672,7 +700,7 @@ RSection *rootsect, *cs; REntry *ce; int i, j; -@@ -2291,8 +2303,12 @@ +@@ -2291,8 +2313,12 @@ mergeKdmRcNewer( const char *path ) } #ifdef XDMCP @@ -688,9 +716,9 @@ if (is22conf( path )) { Index: kdm/kfrontend/Makefile.am =================================================================== ---- kdm/kfrontend/Makefile.am (Revision 581780) -+++ kdm/kfrontend/Makefile.am (Arbeitskopie) -@@ -64,3 +64,7 @@ +--- kdm/kfrontend/Makefile.am.orig ++++ kdm/kfrontend/Makefile.am +@@ -64,3 +64,7 @@ kdm_greet_COMPILE_FIRST = ../config.ci kdm_config_COMPILE_FIRST = ../config.ci genkdmconf_COMPILE_FIRST = ../config.ci @@ -698,3 +726,16 @@ +appsdir = $(kde_datadir)/kdm +apps_SCRIPTS = read_sysconfig.sh + +Index: kdm/kfrontend/kdm_config.c +=================================================================== +--- kdm/kfrontend/kdm_config.c.orig ++++ kdm/kfrontend/kdm_config.c +@@ -433,7 +433,7 @@ ReadConfFile(const char *rcfile) + if (nlen == cursec->nlen && + !memcmp( nstr, cursec->name, nlen )) + { +- LogInfo( "Multiple occurrences of section [%.*s] in %s. " ++ Debug( "Multiple occurrences of section [%.*s] in %s. " + "Consider merging them.\n", nlen, nstr, rcfile ); + goto secfnd; + } ++++++ ksmserver-timed.diff ++++++ --- /var/tmp/diff_new_pack.2d1wcS/_old 2006-11-02 20:21:36.000000000 +0100 +++ /var/tmp/diff_new_pack.2d1wcS/_new 2006-11-02 20:21:36.000000000 +0100 @@ -531,3 +531,529 @@ +</connections> +<layoutdefaults spacing="6" margin="11"/> +</UI> +Nur in ksmserver: .deps. +Nur in ksmserver.orig/: libkdeinit_ksmserver.la. +Nur in ksmserver: .libs. +diff -ru ksmserver.orig/shutdowndlg.cpp ksmserver/shutdowndlg.cpp +--- ksmserver.orig/shutdowndlg.cpp 2006-10-31 10:40:04.000000000 +0100 ++++ ksmserver/shutdowndlg.cpp 2006-11-02 14:05:14.000000000 +0100 +@@ -390,6 +390,7 @@ + QTimer *timer = new QTimer( this ); + timer->start( 1000 ); + connect( timer, SIGNAL( timeout() ), SLOT( updateText() ) ); ++ KDialog::centerOnScreen(this); + } + + void KSMDelayedMessageBox::updateText() +Dateien ksmserver.orig/test.o und ksmserver/test.o sind verschieden. +Dateien ksmserver.orig/testsh und ksmserver/testsh sind verschieden. +Nur in ksmserver: timed.cpp. +Nur in ksmserver: timed.h. +Nur in ksmserver: timed.moc. +diff -ru ksmserver.orig/timed.ui ksmserver/timed.ui +--- ksmserver.orig/timed.ui 2006-10-31 10:36:49.000000000 +0100 ++++ ksmserver/timed.ui 2006-11-02 14:02:57.000000000 +0100 +@@ -7,216 +7,330 @@ + <property name="geometry"> + <rect> + <x>0</x> +- <y>7</y> +- <width>474</width> +- <height>166</height> ++ <y>0</y> ++ <width>463</width> ++ <height>147</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy> +- <hsizetype>0</hsizetype> +- <vsizetype>0</vsizetype> ++ <hsizetype>1</hsizetype> ++ <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="caption"> +- <string>Form1</string> ++ <string>Confirmation</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> +- <widget class="QLayoutWidget"> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <property name="spacing"> ++ <number>0</number> ++ </property> ++ <widget class="QFrame"> + <property name="name"> +- <cstring>layout6</cstring> ++ <cstring>frame3</cstring> ++ </property> ++ <property name="sizePolicy"> ++ <sizepolicy> ++ <hsizetype>1</hsizetype> ++ <vsizetype>1</vsizetype> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="frameShape"> ++ <enum>StyledPanel</enum> ++ </property> ++ <property name="frameShadow"> ++ <enum>Raised</enum> ++ </property> ++ <property name="lineWidth"> ++ <number>2</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <property name="midLineWidth"> ++ <number>0</number> + </property> +- <grid> ++ <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> +- <widget class="QLayoutWidget" row="0" column="1"> ++ <widget class="QLayoutWidget"> + <property name="name"> +- <cstring>layout7</cstring> ++ <cstring>layout10</cstring> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> +- <number>10</number> ++ <number>0</number> + </property> + <property name="spacing"> +- <number>11</number> ++ <number>0</number> + </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>m_title</cstring> +- </property> +- <property name="sizePolicy"> +- <sizepolicy> +- <hsizetype>7</hsizetype> +- <vsizetype>0</vsizetype> +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="font"> +- <font> +- <bold>1</bold> +- </font> +- </property> +- <property name="text"> +- <string>Would you like to shutdown your computer?</string> +- </property> +- <property name="textFormat"> +- <enum>PlainText</enum> +- </property> +- <property name="alignment"> +- <set>AlignVCenter|AlignLeft</set> +- </property> +- </widget> +- <widget class="QLabel"> ++ <widget class="QLayoutWidget"> + <property name="name"> +- <cstring>m_text</cstring> ++ <cstring>layout8</cstring> + </property> +- <property name="sizePolicy"> +- <sizepolicy> +- <hsizetype>7</hsizetype> +- <vsizetype>1</vsizetype> +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text"> +- <string>If you do not act, your computer will shutdown ++ <hbox> ++ <property name="name"> ++ <cstring>unnamed</cstring> ++ </property> ++ <widget class="QLayoutWidget"> ++ <property name="name"> ++ <cstring>layout6</cstring> ++ </property> ++ <vbox> ++ <property name="name"> ++ <cstring>unnamed</cstring> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <property name="spacing"> ++ <number>0</number> ++ </property> ++ <spacer> ++ <property name="name"> ++ <cstring>spacer3_2</cstring> ++ </property> ++ <property name="orientation"> ++ <enum>Vertical</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>MinimumExpanding</enum> ++ </property> ++ <property name="sizeHint"> ++ <size> ++ <width>20</width> ++ <height>2</height> ++ </size> ++ </property> ++ </spacer> ++ <widget class="QLabel"> ++ <property name="name"> ++ <cstring>m_logo</cstring> ++ </property> ++ <property name="sizePolicy"> ++ <sizepolicy> ++ <hsizetype>1</hsizetype> ++ <vsizetype>1</vsizetype> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="minimumSize"> ++ <size> ++ <width>48</width> ++ <height>48</height> ++ </size> ++ </property> ++ <property name="scaledContents"> ++ <bool>true</bool> ++ </property> ++ </widget> ++ <spacer> ++ <property name="name"> ++ <cstring>spacer3</cstring> ++ </property> ++ <property name="orientation"> ++ <enum>Vertical</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>MinimumExpanding</enum> ++ </property> ++ <property name="sizeHint"> ++ <size> ++ <width>20</width> ++ <height>2</height> ++ </size> ++ </property> ++ </spacer> ++ </vbox> ++ </widget> ++ <widget class="QLayoutWidget"> ++ <property name="name"> ++ <cstring>layout7</cstring> ++ </property> ++ <vbox> ++ <property name="name"> ++ <cstring>unnamed</cstring> ++ </property> ++ <property name="margin"> ++ <number>7</number> ++ </property> ++ <widget class="QLabel"> ++ <property name="name"> ++ <cstring>m_title</cstring> ++ </property> ++ <property name="sizePolicy"> ++ <sizepolicy> ++ <hsizetype>7</hsizetype> ++ <vsizetype>0</vsizetype> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="font"> ++ <font> ++ <bold>1</bold> ++ </font> ++ </property> ++ <property name="text"> ++ <string>Would you like to shutdown your computer?</string> ++ </property> ++ <property name="textFormat"> ++ <enum>PlainText</enum> ++ </property> ++ <property name="alignment"> ++ <set>AlignVCenter|AlignLeft</set> ++ </property> ++ </widget> ++ <widget class="QLabel"> ++ <property name="name"> ++ <cstring>m_text</cstring> ++ </property> ++ <property name="sizePolicy"> ++ <sizepolicy> ++ <hsizetype>7</hsizetype> ++ <vsizetype>5</vsizetype> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text"> ++ <string>If you do not act, your computer will shutdown + after X automatically.</string> +- </property> +- <property name="textFormat"> +- <enum>PlainText</enum> +- </property> +- <property name="alignment"> +- <set>WordBreak|AlignTop</set> +- </property> ++ </property> ++ <property name="textFormat"> ++ <enum>PlainText</enum> ++ </property> ++ <property name="alignment"> ++ <set>WordBreak|AlignVCenter</set> ++ </property> ++ </widget> ++ <spacer> ++ <property name="name"> ++ <cstring>spacer4</cstring> ++ </property> ++ <property name="orientation"> ++ <enum>Vertical</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>Preferred</enum> ++ </property> ++ <property name="sizeHint"> ++ <size> ++ <width>30</width> ++ <height>0</height> ++ </size> ++ </property> ++ </spacer> ++ </vbox> ++ </widget> ++ </hbox> + </widget> +- <spacer> +- <property name="name"> +- <cstring>spacer4</cstring> +- </property> +- <property name="orientation"> +- <enum>Vertical</enum> +- </property> +- <property name="sizeType"> +- <enum>Expanding</enum> +- </property> +- <property name="sizeHint"> +- <size> +- <width>20</width> +- <height>2</height> +- </size> +- </property> +- </spacer> +- </vbox> +- </widget> +- <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> +- <property name="name"> +- <cstring>layout1</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <spacer> ++ <widget class="QLayoutWidget"> + <property name="name"> +- <cstring>spacer2</cstring> +- </property> +- <property name="orientation"> +- <enum>Horizontal</enum> +- </property> +- <property name="sizeType"> +- <enum>Expanding</enum> +- </property> +- <property name="sizeHint"> +- <size> +- <width>40</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- <widget class="QPushButton"> +- <property name="name"> +- <cstring>pushButton1</cstring> +- </property> +- <property name="text"> +- <string>Confirm</string> +- </property> +- <property name="on"> +- <bool>false</bool> +- </property> +- </widget> +- <widget class="QPushButton"> +- <property name="name"> +- <cstring>pushButton2</cstring> +- </property> +- <property name="text"> +- <string>Cancel</string> ++ <cstring>layout9</cstring> + </property> ++ <hbox> ++ <property name="name"> ++ <cstring>unnamed</cstring> ++ </property> ++ <spacer> ++ <property name="name"> ++ <cstring>spacer2</cstring> ++ </property> ++ <property name="orientation"> ++ <enum>Horizontal</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>Expanding</enum> ++ </property> ++ <property name="sizeHint"> ++ <size> ++ <width>90</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ <widget class="QPushButton"> ++ <property name="name"> ++ <cstring>pushButton1</cstring> ++ </property> ++ <property name="text"> ++ <string>Confirm</string> ++ </property> ++ <property name="on"> ++ <bool>false</bool> ++ </property> ++ </widget> ++ <spacer> ++ <property name="name"> ++ <cstring>spacer2_2</cstring> ++ </property> ++ <property name="orientation"> ++ <enum>Horizontal</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>Expanding</enum> ++ </property> ++ <property name="sizeHint"> ++ <size> ++ <width>90</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ <widget class="QPushButton"> ++ <property name="name"> ++ <cstring>pushButton2</cstring> ++ </property> ++ <property name="sizePolicy"> ++ <sizepolicy> ++ <hsizetype>1</hsizetype> ++ <vsizetype>5</vsizetype> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text"> ++ <string>Cancel</string> ++ </property> ++ </widget> ++ <spacer> ++ <property name="name"> ++ <cstring>spacer2_2_2</cstring> ++ </property> ++ <property name="orientation"> ++ <enum>Horizontal</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>Expanding</enum> ++ </property> ++ <property name="sizeHint"> ++ <size> ++ <width>90</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </hbox> + </widget> +- </hbox> +- </widget> +- <widget class="QLayoutWidget" row="0" column="0"> +- <property name="name"> +- <cstring>layout5</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <property name="margin"> +- <number>10</number> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>m_logo</cstring> +- </property> +- <property name="sizePolicy"> +- <sizepolicy> +- <hsizetype>1</hsizetype> +- <vsizetype>1</vsizetype> +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="minimumSize"> +- <size> +- <width>48</width> +- <height>48</height> +- </size> +- </property> +- <property name="scaledContents"> +- <bool>true</bool> +- </property> +- </widget> +- <spacer> +- <property name="name"> +- <cstring>spacer3</cstring> +- </property> +- <property name="orientation"> +- <enum>Vertical</enum> +- </property> +- <property name="sizeType"> +- <enum>Expanding</enum> +- </property> +- <property name="sizeHint"> +- <size> +- <width>20</width> +- <height>2</height> +- </size> +- </property> +- </spacer> + </vbox> + </widget> +- </grid> ++ </hbox> + </widget> + </vbox> + </widget> +Nur in ksmserver: timed.ui~. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org