Merge pull request #24 from timxx/dev

Dev

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 project(xmradio)
 
-set(version 0.4.3)
+set(version 0.4.4)
 
 set(XMR_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(CMAKE_MODULE_PATH ${XMR_CMAKE_PATH} ${CMAKE_MODULE_PATH})
@@ -34,6 +34,7 @@ include(FindPkgConfig)
 
 check_include_files(unistd.h HAVE_UNISTD_H)
 check_include_files(malloc.h HAVE_MALLOC_H)
+check_include_files(X11/XF86keysym.h HAVE_MMKEYS_H)
 
 find_program(GLIB_GENMARSHAL
 	NAMES glib-genmarshal

config.h.in

@@ -3,6 +3,7 @@
 
 #cmakedefine HAVE_UNISTD_H
 #cmakedefine HAVE_MALLOC_H
+#cmakedefine HAVE_MMKEYS_H
 #cmakedefine ENABLE_NLS
 #cmakedefine _DEBUG
 

data/com.timxx.xmradio.gschema.xml

@@ -50,10 +50,15 @@
 			<summary>Whether keep window on top</summary>
 			<description>Set true to keep window always on top</description>
 		</key>
+		<key name="stick-window" type="b">
+			<default>false</default>
+			<summary>Asks to stick window</summary>
+			<description>Set true to make window appear on all user desktops</description>
+		</key>
 	</schema>
 	<schema id="com.timxx.xmradio.plugins" path="/apps/xmradio/plugins/">
 		<key name="active-plugins" type="as">
-			<default>['notification', 'indicator', 'mpris', 'xmsearch']</default>
+			<default>['notification', 'indicator', 'mpris', 'xmsearch', 'xmrmmkeys']</default>
 			<summary>Active plugins</summary>
 			<description>List of active plugins.</description>
 		</key>

data/ui/pref.ui

@@ -22,6 +22,21 @@
         <property name="position">0</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkCheckButton" id="cbStick">
+        <property name="label" translatable="yes">Show window on all desktops</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="receives_default">False</property>
+        <property name="xalign">0</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
   </object>
   <object class="GtkBox" id="box_skin">
     <property name="visible">True</property>

debian/changelog

@@ -1,3 +1,27 @@
+xmradio (0.4.4~raring) raring; urgency=low
+
+  * 0.4.4
+    - New plugin: xmrmmkeys
+    - New option: stick window
+
+ -- Weitian Leung <[email protected]>  Sun, 14 Jul 2013 17:03:41 +0800
+
+xmradio (0.4.4~quantal) quantal; urgency=low
+
+  * 0.4.4
+    - New plugin: xmrmmkeys
+    - New option: stick window
+
+ -- Weitian Leung <[email protected]>  Sun, 14 Jul 2013 17:03:02 +0800
+
+xmradio (0.4.4~precise) precise; urgency=low
+
+  * 0.4.4
+    - New plugin: xmrmmkeys
+    - New option: stick window
+
+ -- Weitian Leung <[email protected]>  Sun, 14 Jul 2013 17:01:14 +0800
+
 xmradio (0.4.3~raring) raring; urgency=low
 
   * 0.4.3

plugins/CMakeLists.txt

@@ -3,13 +3,15 @@ add_subdirectory(indicator)
 add_subdirectory(mpris)
 add_subdirectory(autocollect)
 add_subdirectory(xmsearch)
+add_subdirectory(xmrmmkeys)
 
 set(plugins
 	notification
 	indicator
 	mpris
 	autocollect
 	xmsearch
+	xmrmmkeys
 )
 
 # Generate plugin data files to

plugins/xmrmmkeys/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(XMRMMKEYS_SOURCES
+	xmrmmkeys.c
+)
+
+include_directories(${LIBPEAS_INCLUDE_DIRS})
+include_directories(${PLUGIN_INCLUDE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/src)
+include_directories(${GTK3_INCLUDE_DIRS})
+include_directories(${GSTREAMER_INCLUDE_DIRS})
+
+add_library(xmrmmkeys SHARED ${XMRMMKEYS_SOURCES})
+target_link_libraries(xmrmmkeys
+	${LIBPEAS_LIBRARIES}
+)
+
+install(TARGETS xmrmmkeys LIBRARY DESTINATION ${plugindir})
+install(FILES xmrmmkeys.plugin DESTINATION ${plugindir})
+