Skip to content

Commit 81ad557

Browse files
committed
remove unused define. Clean up readme and about text. Remove most references to xmms since it's not really possible to use any longer.
1 parent e975b57 commit 81ad557

File tree

6 files changed

+20
-54
lines changed

6 files changed

+20
-54
lines changed

README.md

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
KDocker
22
-------
33
KDocker will help you dock any application in the system tray. This means you
4-
can dock openoffice, xmms, firefox, thunderbolt, eclipse, anything! Just point
4+
can dock openoffice, firefox, thunderbolt, eclipse, anything! Just point
55
and click. Works for both KDE and GNOME (In fact it should work for most modern
66
window managers that support NET WM Specification. I believe it works for XFCE,
77
for instance)
@@ -14,32 +14,12 @@ System Tray Support
1414
-------------------
1515
KDocker supports the System Tray Protocol from freedesktop.org
1616

17-
Tips to use KDocker
18-
-------------------
19-
1. On KDE, right click on K menu and use the menu editor to create a link of
20-
KDocker and create a shortcut (Windows key + Z). You could use the kdocker.xpm
21-
in the src folder as the icon (its an anchor).
22-
Rationale: ^Z on the shell puts processes in the background. On the same lines,
23-
Windows+Z will help you put windows app to the background ;) (thanks to Thomas
24-
McGuire for this suggestion)
25-
2. With KDocker 0.9, there is an option to dock the current active window (-f).
26-
As soon as you press WinKey+Z, the window which has the focus will be
27-
automatically docked. Thanks to Daniel for this neat feature request.
17+
Website
18+
-------
19+
20+
http://kdocker.com is the official website. It currently redirects to the
21+
development page on GitHub, https://github.com/user-none/KDocker
2822

2923
Reporting Bugs
3024
--------------
31-
Bugs and wishes to https://github.com/user-none/KDocker
32-
33-
Send Girish a postcard!
34-
-------------------
35-
If you love KDocker and would like to thank Girish for starting this wonderful
36-
project, send him a postcard or some stamps to
37-
38-
Girish Ramakrishnan
39-
G7, Block No.12, R.K.Apartments,
40-
Hoysala Nagar,
41-
Bangalore,
42-
Karnataka, India
43-
44-
https://github.com/user-none/KDocker for updates
45-
25+
Bug tracker is at https://github.com/user-none/KDocker

helpers/appdata/kdocker.appdata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<summary>Run command and dock window</summary>
88
<summary xml:lang="it">Esegui comando e aggancia la finestra</summary>
99
<description>
10-
<p>KDocker will help you dock any application in the system tray. This means you can dock openoffice, xmms, firefox, thunderbolt, eclipse, anything! Just point and click. Works for both KDE and GNOME (In fact it should work for most modern window managers that support NET WM Specification. I believe it works for XFCE, for instance)</p>
10+
<p>KDocker will help you dock any application in the system tray. This means you can dock openoffice, firefox, thunderbolt, eclipse, anything! Just point and click. Works for both KDE and GNOME (In fact it should work for most modern window managers that support NET WM Specification. I believe it works for XFCE, for instance)</p>
1111
<p xml:lang="x-eg">Example para 1</p>
1212
<p>All you need to do is start KDocker and select an application using the mouse and lo! the application gets docked into the system tray. The application can also be made to disappear from the task bar.</p>
1313
<p xml:lang="x-eg">Example para 2</p>

helpers/kdocker.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
.Vb 3
229229
\& By default, when the title of the application changes,
230230
\& a popup is displayed from the system tray for 4 seconds
231-
\& Works well with xmms
231+
\& Works well with music players
232232
.Ve
233233
.IP "\fB\-q\fR" 4
234234
.IX Item "-q"

helpers/kdocker.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ B<kdocker> [I<options>]I<>
7777

7878
By default, when the title of the application changes,
7979
a popup is displayed from the system tray for 4 seconds
80-
Works well with xmms
80+
Works well with music players
8181

8282
=item B<-q>
8383

src/constants.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2009, 2012 John Schember <john@nachtimwald.com>
2+
* Copyright (C) 2009, 2012, 2015 John Schember <john@nachtimwald.com>
33
*
44
* This is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
@@ -20,11 +20,12 @@
2020
#include "constants.h"
2121

2222

23-
const QString Constants::ORG_NAME = "com.kdocker";
24-
const QString Constants::DOM_NAME = "kdocker.com";
25-
const QString Constants::APP_NAME = "KDocker";
23+
const QString Constants::APP_NAME = "KDocker";
24+
const QString Constants::ORG_NAME = "com.kdocker";
25+
const QString Constants::DOM_NAME = "kdocker.com";
26+
const QString Constants::WEBSTIE = "http://kdocker.com";
2627
const QString Constants::APP_VERSION = "5.0";
2728

2829
const char *Constants::OPTIONSTRING = "+abd:e:fhi:jklmn:op:qrstvuw:x:";
2930

30-
const QString Constants::ABOUT_MESSAGE = tr("KDocker will help you dock any application into the system tray. This means you can dock openoffice, xmms, firefox, thunderbird, anything! Just point and click. Works for all NET WM compliant window managers - that includes KDE, GNOME, Xfce, Fluxbox and many more.\n\nCreated by %1. Updated and maintained by %2.").arg("Girish Ramakrishnan").arg("John Schember");
31+
const QString Constants::ABOUT_MESSAGE = QString("%1 %2\n\n%3").arg(Constants::APP_NAME).arg(Constants::APP_VERSION).arg(Constants::WEBSITE);

src/trayitem.cpp

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -132,30 +132,15 @@ void TrayItem::restoreWindow() {
132132
if (m_iconified) {
133133
m_iconified = false;
134134
/*
135-
* A simple XMapWindow would not do. Some applications like xmms wont
136-
* redisplay its other windows (like the playlist, equalizer) since the
137-
* Withdrawn->Normal state change code does not map them. So we make the
135+
* A simple XMapWindow would not do. Some applications that use multiple
136+
* windows like xmms (and it's successors) won't redisplay its other
137+
* windows (like the playlist, equalizer) since the Withdrawn->Normal
138+
* state change code does not map them. So we make the
138139
* window go through Withdrawn->Map->Iconify->Normal state.
139140
*/
140141
XMapWindow(display, m_window);
141-
#ifndef DISABLE_ICONIFY_FLIP
142142
XIconifyWindow(display, m_window, DefaultScreen(display));
143143
XSync(display, False);
144-
//long l_state[1] = {NormalState};
145-
//XLibUtil::sendMessage(display, root, m_window, "WM_CHANGE_STATE", 32, SubstructureNotifyMask | SubstructureRedirectMask, l_state, sizeof (l_state));
146-
/*
147-
* ^^ FIXME:
148-
* The window manager will place a WM_STATE property (of type WM_STATE)
149-
* on each top-level client window that is not in the Withdrawn state.
150-
* Top-level windows in the Withdrawn state may or may not have the WM_STATE property.
151-
* Once the top-level window has been withdrawn, the client may re-use it for another purpose.
152-
* Clients that do so should remove the WM_STATE property if it is still present.
153-
* -- http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.3.1
154-
*
155-
* KWin does as the spec says it should.
156-
* If it's not there, trying to change it yields unexpected results.
157-
*/
158-
#endif
159144
m_sizeHint.flags = USPosition;
160145
XSetWMNormalHints(display, m_window, &m_sizeHint);
161146

0 commit comments

Comments
 (0)