Merge lp:~diegotoral/season-one/season-one into lp:season-one

[Diego Toral]

Created bin/season-one executable. Cleanup Application e Window classes. Application class now proper records the dbus application name and set flags.

[lp:~diegotoral/season-one/season-one]

7. By Diego Toral on 2012-06-23

UI file definition added. Created class Builder.

=== added directory 'bin'
=== added file 'bin/season-one'
--- bin/season-one	1970-01-01 00:00:00 +0000
+++ bin/season-one	2012-06-23 01:12:18 +0000
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2012 Caio Oliveira <[e-mail]>
+Copyright (C) 2012 Diego Toral <[e-mail]>
+Copyright (C) 2012 Thiago Abreu <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, 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 General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+import os
+import sys, dbus
+
+from gi.repository import GLib
+
+import gettext
+from gettext import gettext as _
+gettext.textdomain('season-one')
+
+PROJECT_ROOT_DIRECTORY = os.path.abspath(
+	os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0])))
+)
+
+if os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'src')) and PROJECT_ROOT_DIRECTORY not in sys.path:
+	sys.path.append(os.path.join(PROJECT_ROOT_DIRECTORY, 'src'))
+
+# The magic starts here
+try:
+	from ui.application import Application
+
+	app = Application()
+	app.run(sys.argv)
+except ImportError:
+	# TODO Make proper loggin using logging module
+	print "Error while importing!"
\ No newline at end of file

=== added directory 'data/ui'
=== added file 'data/ui/season-window.ui'
--- data/ui/season-window.ui	1970-01-01 00:00:00 +0000
+++ data/ui/season-window.ui	2012-06-23 01:12:18 +0000
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkBox" id="vbox">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkToolbar" id="toolbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="toolbar_style">icons</property>
+        <property name="show_arrow">False</property>
+        <property name="icon_size">2</property>
+        <child>
+          <object class="GtkToggleToolButton" id="power">
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="use_action_appearance">False</property>
+            <property name="label" translatable="yes">toolbutton1</property>
+            <property name="use_underline">True</property>
+            <property name="stock_id">gtk-media-play</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolButton" id="toolbutton1">
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="use_action_appearance">False</property>
+            <property name="label" translatable="yes">toolbutton1</property>
+            <property name="use_underline">True</property>
+            <property name="stock_id">gtk-add</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolButton" id="toolbutton2">
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="use_action_appearance">False</property>
+            <property name="label" translatable="yes">toolbutton2</property>
+            <property name="use_underline">True</property>
+            <property name="stock_id">gtk-info</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSeparatorToolItem" id="toolbutton4">
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="draw">False</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton" id="toolbutton3">
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="use_action_appearance">False</property>
+            <property name="label" translatable="yes">toolbutton3</property>
+            <property name="use_underline">True</property>
+            <property name="stock_id">gtk-properties</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkNotebook" id="notebook">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="show_tabs">False</property>
+        <property name="show_border">False</property>
+        <child>
+          <object class="GtkIconView" id="iconview1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+          </object>
+        </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>

=== modified file 'src/__init__.py'
--- src/__init__.py	2012-06-21 22:51:54 +0000
+++ src/__init__.py	2012-06-23 01:12:18 +0000
@@ -15,16 +15,4 @@
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from ui import application
-
-import gettext
-from gettext import gettext as _
-gettext.textdomain('season-one')
-
-def main():
-	"""The magic starts here"""
-
-	app = Application()
-	app.run()
\ No newline at end of file
+"""
\ No newline at end of file

=== modified file 'src/config.py'
--- src/config.py	2012-06-21 22:51:54 +0000
+++ src/config.py	2012-06-23 01:12:18 +0000
@@ -17,5 +17,23 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import os
+
 __version__ = "0.1"
-__license__ = "GPL v3.0"
\ No newline at end of file
+__license__ = "GPL v3.0"
+__data_dir__ = "../data/"
+
+def get_data_path():
+	path = os.path.abspath(os.path.join(os.path.dirname(__file__), __data_dir__))
+
+	if os.path.exists(path):
+		return path
+
+def get_ui_path():
+	return os.path.join(get_data_path(), "ui/")
+
+def get_media_path():
+	return os.path.join(get_data_path(), "media/")
+
+def get_version():
+	return __version__

=== added file 'src/core/__init__.py'
--- src/core/__init__.py	1970-01-01 00:00:00 +0000
+++ src/core/__init__.py	2012-06-23 01:12:18 +0000
@@ -0,0 +1,18 @@
+"""
+Copyright (C) 2012 Caio Oliveira <[e-mail]>
+Copyright (C) 2012 Diego Toral <[e-mail]>
+Copyright (C) 2012 Thiago Abreu <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, 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 General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
\ No newline at end of file

=== modified file 'src/ui/application.py'
--- src/ui/application.py	2012-06-21 22:51:54 +0000
+++ src/ui/application.py	2012-06-23 01:12:18 +0000
@@ -20,32 +20,47 @@
 
 import optparse
 
-from ui import window as Window
+from ui.window import Window
 from gi.repository import Gtk, Gio
 
 class Application(Gtk.Application):
 	"""Application class"""
 
-	app_id = "season-one"
-	flags = Gio.ApplicationFlags.HANDLES_COMMAND_LINE
+	app_id = "com.SeasonOne"
+	flags = Gio.ApplicationFlags.HANDLES_COMMAND_LINE | Gio.ApplicationFlags.IS_SERVICE
 
 	window = None
 
 	def __init__(self):
-		super(Application, self).__init__(self.app_id, self.flags)
-
+		super(Application, self).__init__()
+
+		# Application configuration
+		self.set_application_id(self.app_id)
+		self.set_flags(self.flags)
+
+		# Connect signals
 		self.connect("activate", self.on_activate)
+		self.connect("shutdown", self.on_shutdown)
 		self.connect("command-line", self.on_command_line)
 
 	def on_hide(self, data):
-		self.remove_window(data)
+		self.window.hide()
 
 	def on_activate(self, data):
-		if self.window is None:
+		if self.window == None:
 			self.window = Window(self)
 			self.add_window(self.window)
+		else:
+			self.window.present()
+
+	def on_shutdown(self, data):
+		"""print shutdown"""
 
 	def on_command_line(self, commandline, data):
-		parser = optparse.OptionParser(version="%%prog %s" % __version__)
+		#parser = optparse.OptionParser(version="%%prog %s" % __version__)
 
 		#parser.add_option("-v", "--verbose")
+
+		self.activate()
+
+		return 1

=== added file 'src/ui/builder.py'
--- src/ui/builder.py	1970-01-01 00:00:00 +0000
+++ src/ui/builder.py	2012-06-23 01:12:18 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2012 Caio Oliveira <[e-mail]>
+Copyright (C) 2012 Diego Toral <[e-mail]>
+Copyright (C) 2012 Thiago Abreu <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, 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 General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+import os
+
+from gi.repository import Gtk
+from config import get_ui_path
+
+class Builder(Gtk.Builder):
+	"""Builder class handles ui creation"""
+
+	def __init__(self):
+		super(Builder, self).__init__()
+
+	def add_from_file(self, file):
+		path = os.path.join(get_ui_path(), file)
+
+		return Gtk.Builder.add_from_file(self, path)

=== modified file 'src/ui/window.py'
--- src/ui/window.py	2012-06-21 22:51:54 +0000
+++ src/ui/window.py	2012-06-23 01:12:18 +0000
@@ -18,18 +18,42 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import os
+
 from gi.repository import Gtk
+from ui.builder import Builder
+from config import get_data_path
 
 class Window(Gtk.ApplicationWindow):
 	"""The main window of Season One"""
 
 	title = "Season One"
-	width = 300
-	height = 200
+	min_width = 559
+	min_height = 562
+
+	vbox = None
+	toolbar = None
+	notebook = None
 
 	def __init__(self, app):
-		super(Window, self).__init__(app)
-
-		self.connect("hide", app.on_hide, self)
+		super(Window, self).__init__(type=Gtk.WindowType.TOPLEVEL, application=app)
+
+		# Default window configuration
+		self.set_title(self.title)
+		self.set_default_size(self.min_width, self.min_height)
+
+		self.create_ui()
+		self.show_all()
 		
+	def create_ui(self):
+		builder = Builder()
+		builder.add_from_file("season-window.ui")
+
+		self.vbox = builder.get_object("vbox")
+		self.toolbar = builder.get_object("toolbar")
+		self.notebook = builder.get_object("notebook")
+
+		self.add(self.vbox)
+
+