From 0e73ee70a4ae85c3ca87b4acde4d8704e3f9b053 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sun, 13 Jan 2013 12:19:08 +0100 Subject: [PATCH 1/4] SVN_SILENT made messages (.desktop file) --- effects/mouseclick/mouseclick.desktop | 1 + effects/mouseclick/mouseclick_config.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/effects/mouseclick/mouseclick.desktop b/effects/mouseclick/mouseclick.desktop index 2b7a7bc103..4223f0fe91 100644 --- a/effects/mouseclick/mouseclick.desktop +++ b/effects/mouseclick/mouseclick.desktop @@ -4,6 +4,7 @@ Name[bs]=Animacija klika mišem Name[ca]=Animació de clic de ratolí Name[cs]=Animace kliknutí myši Name[da]=Animation af museklik +Name[de]=Animation für Mausklicks Name[el]=Εφέ κίνησης με κλικ του ποντικιού Name[es]=Animación del clic de ratón Name[et]=Hiireklõpsu animeerimine diff --git a/effects/mouseclick/mouseclick_config.desktop b/effects/mouseclick/mouseclick_config.desktop index e859a3f7a4..73d6c5ff69 100644 --- a/effects/mouseclick/mouseclick_config.desktop +++ b/effects/mouseclick/mouseclick_config.desktop @@ -11,6 +11,7 @@ Name[bs]=Animacija klika mišem Name[ca]=Animació de clic de ratolí Name[cs]=Animace kliknutí myši Name[da]=Animation af museklik +Name[de]=Animation für Mausklicks Name[el]=Εφέ κίνησης με κλικ του ποντικιού Name[es]=Animación del clic de ratón Name[et]=Hiireklõpsu animeerimine From 88f998a924f7533498039a802ffce10e071f3dc7 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Mon, 14 Jan 2013 12:46:29 +0100 Subject: [PATCH 2/4] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwinoptions/kwinfocus.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 5239348f12..fde7d2b954 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -146,7 +146,7 @@ Comment[lv]=Šeit jūs varat konfigurēt logu fokusēšanās politiku Comment[mai]=विंडो फोकस पालिसी बिन्यस्त करू Comment[mk]=Конфигурирајте ја политиката на фокусирање на прозорците Comment[ml]=ജാലകം ഫോകസ് ചെയ്യേണ്ടതെങ്ങനെയെന്നു ക്രമീകരിക്കുക -Comment[mr]=चौकट केंद्र करार संयोजीत करा +Comment[mr]=चौकट केंद्रीत धोरण संयोजीत करा Comment[nb]=Sett opp praksis for vindusfokus Comment[nds]=Regeln för den Finsterfokus instellen Comment[ne]=सञ्झ्याल फोकस नीति कन्फिगर गर्नुहोस् From a1c76f4df2447cf7ea1e316437f2ef342f6080a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 12 Jan 2013 09:54:24 +0100 Subject: [PATCH 3/4] Gather support information about screens Adds a section about screens to supportInformation containing: * whether multi-head is used * in case of multi-head the screen number * the number of screens * geometry per screen That should hopefully end the two often asked questions about the user's screen setup, especially if they say they use multi-head. REVIEW: 108363 --- workspace.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/workspace.cpp b/workspace.cpp index c42f420a8d..dccc41fa3b 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -82,6 +82,7 @@ namespace KWin { extern int screen_number; +extern bool is_multihead; static const int KWIN_MAX_NUMBER_DESKTOPS = 20; #ifdef KWIN_BUILD_KAPPMENU @@ -2196,6 +2197,25 @@ QString Workspace::supportInformation() const } support.append(QLatin1String(property.name()) % ": " % options->property(property.name()).toString() % '\n'); } + support.append("\nScreens\n"); + support.append( "=======\n"); + support.append("Multi-Head: "); + if (is_multihead) { + support.append("yes\n"); + support.append(QString("Head: %1\n").arg(screen_number)); + } else { + support.append("no\n"); + } + support.append(QString("Number of Screens: %1\n").arg(QApplication::desktop()->screenCount())); + for (int i=0; iscreenCount(); ++i) { + const QRect geo = QApplication::desktop()->screenGeometry(i); + support.append(QString("Screen %1 Geometry: %2,%3,%4x%5\n") + .arg(i) + .arg(geo.x()) + .arg(geo.y()) + .arg(geo.width()) + .arg(geo.height())); + } support.append("\nCompositing\n"); support.append( "===========\n"); support.append("Qt Graphics System: "); From 412afa3dcd5db9ab17a83c972cd86d32737b2c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 10 Jan 2013 10:10:35 +0100 Subject: [PATCH 4/4] Remove asserts from Compositor and wrap Toplevel::compositing() around Workspace::compositing() BUG: 312712 FIXED-IN: 4.10 REVIEW: 108321 --- composite.cpp | 3 +-- composite.h | 1 - workspace.h | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/composite.cpp b/composite.cpp index 99eb65dd72..ea540a4ce9 100644 --- a/composite.cpp +++ b/composite.cpp @@ -935,8 +935,7 @@ void Toplevel::damageNotifyEvent(XDamageNotifyEvent* e) bool Toplevel::compositing() const { - Compositor *c = Compositor::self(); - return c && c->hasScene(); + return Workspace::self()->compositing(); } void Client::damageNotifyEvent(XDamageNotifyEvent* e) diff --git a/composite.h b/composite.h index 1655ffeedd..04ac4d56cf 100644 --- a/composite.h +++ b/composite.h @@ -139,7 +139,6 @@ public: * @see createCompositor **/ static Compositor *self() { - Q_ASSERT(s_compositor); return s_compositor; } /** diff --git a/workspace.h b/workspace.h index 708e23333d..ff37842213 100644 --- a/workspace.h +++ b/workspace.h @@ -525,6 +525,11 @@ public: return movingClient; } + /** + * @returns Whether we have a Compositor and it is active (Scene created) + **/ + bool compositing() const; + public slots: // Keybindings void slotSwitchDesktopNext(); @@ -745,11 +750,6 @@ private: static NET::WindowType txtToWindowType(const char* txt); static bool sessionInfoWindowTypeMatch(Client* c, SessionInfo* info); - /** - * @returns Whether we have a Compositor and it is active (Scene created) - **/ - bool compositing() const; - Client* active_client; Client* last_active_client; Client* most_recently_raised; // Used ONLY by raiseOrLowerClient()