Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Wed Sep 24 16:58:33 CEST 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-09-16 01:43:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-09-24 16:57:50.210653000 +0200
@@ -1,0 +2,16 @@
+Thu Sep 18 09:50:31 CEST 2008 - stbinner@suse.de
+
+- improve branding package definitions
+
+-------------------------------------------------------------------
+Wed Sep 17 17:54:10 CEST 2008 - llunak@suse.cz
+
+- improve detection of whether the system is capable of decent
+ compositing (fate#304756)
+
+-------------------------------------------------------------------
+Wed Sep 17 17:41:06 CEST 2008 - llunak@suse.cz
+
+- fix handling of Display key (fate#4147)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.m23636/_old 2008-09-24 16:58:08.000000000 +0200
+++ /var/tmp/diff_new_pack.m23636/_new 2008-09-24 16:58:08.000000000 +0200
@@ -29,7 +29,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.1.1
-Release: 14
+Release: 15
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -66,6 +66,13 @@
/usr/share/wallpapers
%changelog
+* Thu Sep 18 2008 stbinner@suse.de
+- improve branding package definitions
+* Wed Sep 17 2008 llunak@suse.cz
+- improve detection of whether the system is capable of decent
+ compositing (fate#304756)
+* Wed Sep 17 2008 llunak@suse.cz
+- fix handling of Display key (fate#4147)
* Mon Sep 15 2008 dmueller@suse.de
- adjust buildrequires
* Fri Sep 12 2008 llunak@suse.cz
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.m23636/_old 2008-09-24 16:58:08.000000000 +0200
+++ /var/tmp/diff_new_pack.m23636/_new 2008-09-24 16:58:08.000000000 +0200
@@ -34,7 +34,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.1.1
-Release: 14
+Release: 15
Source0: kdebase-workspace-%version.tar.bz2
Source2: titlebar_decor.png
Source3: kwin-cubecap.png
@@ -203,7 +203,7 @@
%if %suse_version > 1030
#BRAND: FIXME
Provides: %{name}-branding = 11.1
-Supplements: branding-upstream = 11.1
+Supplements: packageand(kdebase4-workspace:branding-upstream)
%endif
%description branding-upstream
@@ -228,8 +228,8 @@
Group: System/GUI/KDE
%if %suse_version > 1030
#BRAND: FIXME
-Provides: %{name}-branding = 11.1
-Supplements: branding-upstream = 11.1
+Provides: kde4-kdm-branding = 11.1
+Supplements: packageand(kde4-kdm:branding-upstream)
%endif
%description -n kde4-kdm-branding-upstream
@@ -352,6 +352,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: KDE login and display manager
+Requires: kde4-kdm-branding = 11.1
Requires: kdebase4-workspace
%kde4_runtime_requires
@@ -740,6 +741,13 @@
%_kde_share_dir/services/kded/randrmonitor.desktop
%changelog
+* Thu Sep 18 2008 stbinner@suse.de
+- improve branding package definitions
+* Wed Sep 17 2008 llunak@suse.cz
+- improve detection of whether the system is capable of decent
+ compositing (fate#304756)
+* Wed Sep 17 2008 llunak@suse.cz
+- fix handling of Display key (fate#4147)
* Mon Sep 15 2008 dmueller@suse.de
- adjust buildrequires
* Fri Sep 12 2008 llunak@suse.cz
++++++ kwin.diff ++++++
++++ 2008 lines (skipped)
++++ between KDE/kdebase4-workspace/kwin.diff
++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/kwin.diff
++++++ randr12.diff ++++++
--- /var/tmp/diff_new_pack.m23636/_old 2008-09-24 16:58:10.000000000 +0200
+++ /var/tmp/diff_new_pack.m23636/_new 2008-09-24 16:58:10.000000000 +0200
@@ -1,7 +1,7 @@
Index: randrconfig.h
===================================================================
---- kcontrol/randr/randrconfig.h (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 860259)
-+++ kcontrol/randr/randrconfig.h (.../work/~seli/randr) (revision 860259)
+--- kcontrol/randr/randrconfig.h (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/randrconfig.h (.../work/~seli/randr) (revision 861923)
@@ -24,6 +24,7 @@
#include "randr.h"
@@ -19,7 +19,15 @@
signals:
void changed(bool change);
-@@ -70,6 +73,8 @@
+@@ -62,6 +65,7 @@
+ virtual void resizeEvent(QResizeEvent *event);
+
+ private:
++ void insufficientVirtualSize();
+ RandRDisplay *m_display;
+ bool m_changed;
+ bool m_firstLoad;
+@@ -70,6 +74,8 @@
QList m_outputList;
QGraphicsScene *m_scene;
LayoutManager *m_layoutManager;
@@ -28,10 +36,28 @@
};
+Index: layoutmanager.cpp
+===================================================================
+--- kcontrol/randr/layoutmanager.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/layoutmanager.cpp (.../work/~seli/randr) (revision 861923)
+@@ -148,3 +148,13 @@
+ }
+
+ }
++
++GraphicsView::GraphicsView( QWidget* parent )
++ : QGraphicsView( parent )
++ {
++ }
++
++QSize GraphicsView::sizeHint() const
++ {
++ return QSize( 200, 200 );
++ }
Index: krandrtray.cpp
===================================================================
---- kcontrol/randr/krandrtray.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 860259)
-+++ kcontrol/randr/krandrtray.cpp (.../work/~seli/randr) (revision 860259)
+--- kcontrol/randr/krandrtray.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/krandrtray.cpp (.../work/~seli/randr) (revision 861923)
@@ -468,4 +468,5 @@
kcm->setPlainCaption( i18n( "Configure Display" ) );
kcm->addModule( "display" );
@@ -40,9 +66,9 @@
}
Index: randrconfigbase.ui
===================================================================
---- kcontrol/randr/randrconfigbase.ui (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 860259)
-+++ kcontrol/randr/randrconfigbase.ui (.../work/~seli/randr) (revision 860259)
-@@ -12,22 +12,33 @@
+--- kcontrol/randr/randrconfigbase.ui (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/randrconfigbase.ui (.../work/~seli/randr) (revision 861923)
+@@ -12,28 +12,46 @@
<property name="windowTitle" >
<string>Display Configuration (X11 Resize, Rotate and Reflect)</string>
</property>
@@ -67,7 +93,7 @@
+ <item>
+ <widget class="QWidget" native="1" name="outputList" >
+ <property name="sizePolicy" >
-+ <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
++ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
@@ -90,11 +116,25 @@
+ </layout>
</item>
<item>
- <widget class="QGraphicsView" name="screenView" />
+- <widget class="QGraphicsView" name="screenView" />
++ <widget class="GraphicsView" name="screenView" />
+ </item>
+ </layout>
+ </widget>
++ <customwidgets>
++ <customwidget>
++ <class>GraphicsView</class>
++ <extends>QGraphicsView</extends>
++ <header>layoutmanager.h</header>
++ </customwidget>
++ </customwidgets>
+ <resources/>
+ <connections/>
+ </ui>
Index: CMakeLists.txt
===================================================================
---- kcontrol/randr/CMakeLists.txt (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 860259)
-+++ kcontrol/randr/CMakeLists.txt (.../work/~seli/randr) (revision 860259)
+--- kcontrol/randr/CMakeLists.txt (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/CMakeLists.txt (.../work/~seli/randr) (revision 861923)
@@ -1,5 +1,9 @@
include_directories( ${X11_Xrandr_INCLUDE_PATH} )
@@ -107,18 +147,20 @@
Index: randrconfig.cpp
===================================================================
---- kcontrol/randr/randrconfig.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 860259)
-+++ kcontrol/randr/randrconfig.cpp (.../work/~seli/randr) (revision 860259)
-@@ -28,6 +28,8 @@
+--- kcontrol/randr/randrconfig.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/randrconfig.cpp (.../work/~seli/randr) (revision 861923)
+@@ -28,6 +28,10 @@
#include "randrdisplay.h"
#include "randrscreen.h"
+#include
++#include
++#include
+
RandRConfig::RandRConfig(QWidget *parent, RandRDisplay *display)
: QWidget(parent), Ui::RandRConfigBase()
{
-@@ -44,6 +46,10 @@
+@@ -44,6 +48,10 @@
setupUi(this);
@@ -129,7 +171,7 @@
// create the container for the settings widget
QHBoxLayout *layout = new QHBoxLayout(outputList);
layout->setSpacing(0);
-@@ -62,6 +68,7 @@
+@@ -62,6 +70,7 @@
RandRConfig::~RandRConfig()
{
@@ -137,7 +179,7 @@
}
void RandRConfig::load(void)
-@@ -219,5 +226,48 @@
+@@ -219,5 +228,66 @@
screenView->setSceneRect(r);
}
@@ -184,13 +226,31 @@
+ m_indicators.clear();
+}
+
++void RandRConfig::insufficientVirtualSize()
++{
++ if( KMessageBox::questionYesNo( this,
++ i18n( "Insufficient virtual size for the total screen size.\n"
++ "The configured virtual size of your X server is insufficient for this setup. "
++ "This configuration needs to be adjusted.\n"
++ "Do you wish to run a tool to adjust the configuration?" )) == KMessageBox::Yes )
++ {
++ KProcess proc;
++ // TODO
++ if( proc.execute() == 0 )
++ KMessageBox::information( this, i18n( "Configuration has been adjusted. Please restart "
++ "your session for this change to take effect." ));
++ else
++ KMessageBox::sorry( this, i18n( "Changing configuration failed. Please adjust your xorg.conf manually." ));
++ }
++}
++
#include "randrconfig.moc"
Index: module/randrmonitor.cpp
===================================================================
--- kcontrol/randr/module/randrmonitor.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrmonitor.cpp (.../work/~seli/randr) (revision 860259)
-@@ -0,0 +1,163 @@
++++ kcontrol/randr/module/randrmonitor.cpp (.../work/~seli/randr) (revision 861923)
+@@ -0,0 +1,208 @@
+/********************************************************************
+
+Copyright (C) 2008 Lubos Lunak
@@ -226,6 +286,10 @@
+#include
+#include
+
++#include
++#include
++#include
++
+K_PLUGIN_FACTORY(RandrMonitorModuleFactory,
+ registerPlugin<RandrMonitorModule>();
+ )
@@ -276,7 +340,7 @@
+ KActionCollection* coll = new KActionCollection( this );
+ KAction* act = coll->addAction( "display" );
+ act->setText( i18n( "Switch Display" ));
-+ act->setShortcut( Qt::Key_Display );
++ act->setGlobalShortcut( KShortcut( Qt::Key_Display ));
+ connect( act, SIGNAL( triggered( bool )), SLOT( switchDisplay()));
+ }
+
@@ -344,7 +408,48 @@
+
+void RandrMonitorModule::switchDisplay()
+ {
-+ // TODO
++ QList< RandROutput* > outputs;
++ RandRDisplay display;
++ for( int scr = 0;
++ scr < display.numScreens();
++ ++scr )
++ {
++ foreach( RandROutput* output, display.screen( scr )->outputs())
++ {
++ if( !output->isConnected())
++ continue;
++ if( !outputs.contains( output ))
++ outputs.append( output );
++ }
++ }
++ if( outputs.count() <= 1 ) // just one, do nothing
++ return;
++ if( outputs.count() == 2 ) // alternative between one, second, both
++ {
++ if( outputs[ 0 ]->isActive() && !outputs[ 1 ]->isActive())
++ {
++ enableOutput( outputs[ 1 ], true );
++ enableOutput( outputs[ 0 ], false );
++ }
++ else if( !outputs[ 0 ]->isActive() && outputs[ 1 ]->isActive())
++ {
++ enableOutput( outputs[ 1 ], true );
++ enableOutput( outputs[ 0 ], true );
++ }
++ else
++ {
++ enableOutput( outputs[ 0 ], true );
++ enableOutput( outputs[ 1 ], false );
++ }
++ return;
++ }
++ // no idea what to do here
++ KToolInvocation::kdeinitExec( "kcmshell4", QStringList() << "display" );
++ }
++
++void RandrMonitorModule::enableOutput( RandROutput* output, bool enable )
++ { // a bit lame, but I don't know how to do this easily with this codebase :-/
++ KProcess::execute( QStringList() << "xrandr" << "--output" << output->name() << ( enable ? "--auto" : "--off" ));
+ }
+
+bool RandrMonitorHelper::x11Event( XEvent* e )
@@ -357,8 +462,8 @@
Index: module/randrmonitor.h
===================================================================
--- kcontrol/randr/module/randrmonitor.h (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrmonitor.h (.../work/~seli/randr) (revision 860259)
-@@ -0,0 +1,74 @@
++++ kcontrol/randr/module/randrmonitor.h (.../work/~seli/randr) (revision 861923)
+@@ -0,0 +1,78 @@
+/********************************************************************
+
+Copyright (C) 2008 Lubos Lunak
@@ -381,12 +486,15 @@
+#define RANDRMONITOR_H
+
+#include
++#include
+#include
+
+#include
+#include
+#include
+
++class RandROutput;
++
+class RandrMonitorHelper;
+
+class RandrMonitorModule
@@ -404,6 +512,7 @@
+ void initRandr();
+ void getRandrInfo( XRROutputChangeNotifyEvent* e, QString* change, QRect* rect );
+ QStringList connectedMonitors() const;
++ void enableOutput( RandROutput* output, bool enable );
+ bool have_randr;
+ int randr_base;
+ int randr_error;
@@ -436,7 +545,7 @@
Index: module/TODO
===================================================================
--- kcontrol/randr/module/TODO (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/TODO (.../work/~seli/randr) (revision 860259)
++++ kcontrol/randr/module/TODO (.../work/~seli/randr) (revision 861923)
@@ -0,0 +1,7 @@
+- zrusit ten modalni dialog
+- zkontrolovat, ze tohle opravdu nerusi randr eventmask pro Qt
@@ -448,7 +557,7 @@
Index: module/randrmonitor.desktop
===================================================================
--- kcontrol/randr/module/randrmonitor.desktop (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrmonitor.desktop (.../work/~seli/randr) (revision 860259)
++++ kcontrol/randr/module/randrmonitor.desktop (.../work/~seli/randr) (revision 861923)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Detecting RANDR (monitor) changes
@@ -461,11 +570,23 @@
Index: module/CMakeLists.txt
===================================================================
--- kcontrol/randr/module/CMakeLists.txt (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/CMakeLists.txt (.../work/~seli/randr) (revision 860259)
-@@ -0,0 +1,13 @@
++++ kcontrol/randr/module/CMakeLists.txt (.../work/~seli/randr) (revision 861923)
+@@ -0,0 +1,25 @@
++include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. )
++
+########### next target ###############
+
-+set(kded_randrmonitor_PART_SRCS randrmonitor.cpp )
++set(kded_randrmonitor_PART_SRCS
++ randrmonitor.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../randrdisplay.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../randrscreen.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../randroutput.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../randrcrtc.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../randrmode.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../randr.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../legacyrandrscreen.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../ktimerdialog.cpp
++ )
+
+kde4_add_plugin(kded_randrmonitor ${kded_randrmonitor_PART_SRCS})
+
@@ -479,7 +600,7 @@
Index: module/randrpolltest.cpp
===================================================================
--- kcontrol/randr/module/randrpolltest.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrpolltest.cpp (.../work/~seli/randr) (revision 860259)
++++ kcontrol/randr/module/randrpolltest.cpp (.../work/~seli/randr) (revision 861923)
@@ -0,0 +1,63 @@
+#include
+#include
@@ -544,3 +665,41 @@
+ }
+ XCloseDisplay( dpy );
+ }
+Index: randrscreen.cpp
+===================================================================
+--- kcontrol/randr/randrscreen.cpp (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/randrscreen.cpp (.../work/~seli/randr) (revision 861923)
+@@ -389,7 +389,7 @@
+ m_unifiedRect = group.readEntry("UnifiedRect", QRect());
+ m_unifiedRotation = group.readEntry("UnifiedRotation", (int) RandR::Rotate0);
+
+- slotUnifyOutputs(m_outputsUnified);
++// slotUnifyOutputs(m_outputsUnified);
+
+ foreach(RandROutput *output, m_outputs)
+ {
+Index: layoutmanager.h
+===================================================================
+--- kcontrol/randr/layoutmanager.h (.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
++++ kcontrol/randr/layoutmanager.h (.../work/~seli/randr) (revision 861923)
+@@ -21,6 +21,7 @@
+
+ #include <QObject>
+ #include "randr.h"
++#include
+
+ class RandRScreen;
+ class QGraphicsScene;
+@@ -45,4 +46,12 @@
+
+ };
+
++class GraphicsView : public QGraphicsView
++{
++ Q_OBJECT
++public:
++ GraphicsView( QWidget* parent );
++ virtual QSize sizeHint() const;
++};
++
+ #endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org