[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] plasma/generic/applets/systemtray: Merge branch 'plasma/dmitrya/systemtray-qml'
From:       Dmitry Ashkadov <dmitry.ashkadov () gmail ! com>
Date:       2012-10-23 9:38:33
Message-ID: 20121023093833.F3A42A6078 () git ! kde ! org
[Download RAW message or body]

Git commit ecbd94dc21e4313d84f3391dad7dd124a2c7acd6 by Dmitry Ashkadov.
Committed on 23/10/2012 at 11:36.
Pushed by dmitrya into branch 'master'.

Merge branch 'plasma/dmitrya/systemtray-qml'

Conflicts:
	plasma/generic/applets/systemtray/ui/taskarea.cpp

M  +73   -0    plasma/generic/applets/systemtray/package/contents/ui/main.js
M  +293  -244  plasma/generic/applets/systemtray/ui/applet.cpp

http://commits.kde.org/kde-workspace/ecbd94dc21e4313d84f3391dad7dd124a2c7acd6

diff --cc plasma/generic/applets/systemtray/package/contents/ui/main.js
index 0000000,b073cdb..10518cd
mode 000000,100644..100644
--- a/plasma/generic/applets/systemtray/package/contents/ui/main.js
+++ b/plasma/generic/applets/systemtray/package/contents/ui/main.js
@@@ -1,0 -1,73 +1,73 @@@
+ /***********************************************************************************************************************
 +  * KDE System Tray (Plasmoid)
+  *
+  * Copyright (C) 2012 ROSA  <support@rosalab.ru>
+  * License: LGPLv2+
+  * Authors: Dmitry Ashkadov <dmitry.ashkadov@rosalab.ru>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU Library General Public License as
+  * published by the Free Software Foundation; either version 2 or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details
+  *
+  * You should have received a copy of the GNU Library General Public
+  * License along with this program; if not, write to the
+  * Free Software Foundation, Inc.,
+  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  **********************************************************************************************************************/
 + 
+ // This isn't a stateless library, it is intended only as a stuff for main.qml
+ 
+ // Constants
+ var ICONS_SIZE = 24 // Size of icons, icons are square i.e. width == height
+ var MINIMUM_SIZE = 30 // minimum size of widget
+ var ARROW_MARGINS = 5 // margins for an arrow
+ var BLINK_INTERVAL = 750 // time interval of blinking
 -var TASK_NOTIFICATIONS_TYPEID = "notifications"
++var TASK_NOTIFICATIONS_TYPEID = "org.kde.notifications"
+ var USE_GRID_IN_POPUP = false  // true if in popup icons should be placed like a \
grid without names + 
+ 
+ // [const] Location of item (model for icon)
+ var LOCATION_TRAY = 0
+ var LOCATION_POPUP = LOCATION_TRAY + 1
+ var LOCATION_NOTIFICATION = LOCATION_POPUP + 1
+ 
+ 
+ // [const] List of possible locations
+ var LOCATIONS = [
+     LOCATION_TRAY,
+     LOCATION_POPUP,
+     LOCATION_NOTIFICATION
+ ]
+ 
+ // [const] Number of locations
+ var LOCATIONS_NUMBER = LOCATIONS.length
+ 
+ // This list determines order of categories of tasks
+ var CATEGORIES = [
+     TaskCategoryUnknown,
+     TaskCategoryApplicationStatus,
+     TaskCategoryCommunications,
+     TaskCategorySystemServices,
+     TaskCategoryHardware
+ ]
+ 
+ 
+ 
+ // Set of tasks sets, each set for one location (area)
+ var tasks = new Array(LOCATIONS_NUMBER)
+ 
+ 
+ // Returns location of task by ID of task
+ function findLocation(id)
+ {
+     for (var i = 0; i < LOCATIONS_NUMBER; ++i) {
+         if (tasks[i].get(id))
+             return LOCATIONS[i]
+     }
+ }


[prev in list] [next in list] [prev in thread] [next in thread]