Permalink
Browse files

remove unused define. Clean up readme and about text. Remove most ref…

…erences to xmms since it's not really possible to use any longer.
  • Loading branch information...
user-none committed May 3, 2015
1 parent e975b57 commit 81ad5573870455e3946a840879f63c6b2aee2602
Showing with 20 additions and 54 deletions.
  1. +7 −27 README.md
  2. +1 −1 helpers/appdata/kdocker.appdata.xml
  3. +1 −1 helpers/kdocker.1
  4. +1 −1 helpers/kdocker.pod
  5. +6 −5 src/constants.cpp
  6. +4 −19 src/trayitem.cpp
View
@@ -1,7 +1,7 @@
KDocker
-------
KDocker will help you dock any application in the system tray. This means you
can dock openoffice, xmms, firefox, thunderbolt, eclipse, anything! Just point
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)
@@ -14,32 +14,12 @@ System Tray Support
-------------------
KDocker supports the System Tray Protocol from freedesktop.org
Tips to use KDocker
-------------------
1. On KDE, right click on K menu and use the menu editor to create a link of
KDocker and create a shortcut (Windows key + Z). You could use the kdocker.xpm
in the src folder as the icon (its an anchor).
Rationale: ^Z on the shell puts processes in the background. On the same lines,
Windows+Z will help you put windows app to the background ;) (thanks to Thomas
McGuire for this suggestion)
2. With KDocker 0.9, there is an option to dock the current active window (-f).
As soon as you press WinKey+Z, the window which has the focus will be
automatically docked. Thanks to Daniel for this neat feature request.
Website
-------
http://kdocker.com is the official website. It currently redirects to the
development page on GitHub, https://github.com/user-none/KDocker
Reporting Bugs
--------------
Bugs and wishes to https://github.com/user-none/KDocker
Send Girish a postcard!
-------------------
If you love KDocker and would like to thank Girish for starting this wonderful
project, send him a postcard or some stamps to
Girish Ramakrishnan
G7, Block No.12, R.K.Apartments,
Hoysala Nagar,
Bangalore,
Karnataka, India
https://github.com/user-none/KDocker for updates
Bug tracker is at https://github.com/user-none/KDocker
@@ -7,7 +7,7 @@
<summary>Run command and dock window</summary>
<summary xml:lang="it">Esegui comando e aggancia la finestra</summary>
<description>
<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>
<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>
<p xml:lang="x-eg">Example para 1</p>
<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>
<p xml:lang="x-eg">Example para 2</p>
View
@@ -228,7 +228,7 @@
.Vb 3
\& By default, when the title of the application changes,
\& a popup is displayed from the system tray for 4 seconds
\& Works well with xmms
\& Works well with music players
.Ve
.IP "\fB\-q\fR" 4
.IX Item "-q"
View
@@ -77,7 +77,7 @@ B<kdocker> [I<options>]I<>
By default, when the title of the application changes,
a popup is displayed from the system tray for 4 seconds
Works well with xmms
Works well with music players
=item B<-q>
View
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009, 2012 John Schember <john@nachtimwald.com>
* Copyright (C) 2009, 2012, 2015 John Schember <john@nachtimwald.com>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,11 +20,12 @@
#include "constants.h"
const QString Constants::ORG_NAME = "com.kdocker";
const QString Constants::DOM_NAME = "kdocker.com";
const QString Constants::APP_NAME = "KDocker";
const QString Constants::APP_NAME = "KDocker";
const QString Constants::ORG_NAME = "com.kdocker";
const QString Constants::DOM_NAME = "kdocker.com";
const QString Constants::WEBSTIE = "http://kdocker.com";
const QString Constants::APP_VERSION = "5.0";
const char *Constants::OPTIONSTRING = "+abd:e:fhi:jklmn:op:qrstvuw:x:";
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");
const QString Constants::ABOUT_MESSAGE = QString("%1 %2\n\n%3").arg(Constants::APP_NAME).arg(Constants::APP_VERSION).arg(Constants::WEBSITE);
View
@@ -132,30 +132,15 @@ void TrayItem::restoreWindow() {
if (m_iconified) {
m_iconified = false;
/*
* A simple XMapWindow would not do. Some applications like xmms wont
* redisplay its other windows (like the playlist, equalizer) since the
* Withdrawn->Normal state change code does not map them. So we make the
* A simple XMapWindow would not do. Some applications that use multiple
* windows like xmms (and it's successors) won't redisplay its other
* windows (like the playlist, equalizer) since the Withdrawn->Normal
* state change code does not map them. So we make the
* window go through Withdrawn->Map->Iconify->Normal state.
*/
XMapWindow(display, m_window);
#ifndef DISABLE_ICONIFY_FLIP
XIconifyWindow(display, m_window, DefaultScreen(display));
XSync(display, False);
//long l_state[1] = {NormalState};
//XLibUtil::sendMessage(display, root, m_window, "WM_CHANGE_STATE", 32, SubstructureNotifyMask | SubstructureRedirectMask, l_state, sizeof (l_state));
/*
* ^^ FIXME:
* The window manager will place a WM_STATE property (of type WM_STATE)
* on each top-level client window that is not in the Withdrawn state.
* Top-level windows in the Withdrawn state may or may not have the WM_STATE property.
* Once the top-level window has been withdrawn, the client may re-use it for another purpose.
* Clients that do so should remove the WM_STATE property if it is still present.
* -- http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.3.1
*
* KWin does as the spec says it should.
* If it's not there, trying to change it yields unexpected results.
*/
#endif
m_sizeHint.flags = USPosition;
XSetWMNormalHints(display, m_window, &m_sizeHint);

0 comments on commit 81ad557

Please sign in to comment.