Finished v1.0.0

ctriantaf · Jun 30, 2012 · 9b0016a · 9b0016a
1 parent 1fe5362
commit 9b0016a
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 56 deletions.
diff --git a/data/ui/AboutMangarDialog.ui b/data/ui/AboutMangarDialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires about_mangar_dialog 1.0 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="AboutMangarDialog" id="about_mangar_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -11,8 +11,8 @@
     <property name="version">1.0.0</property>
     <property name="copyright" translatable="yes">2012, Chris Triantafillis
 </property>
-    <property name="license" translatable="yes">GPL3</property>
     <property name="authors">Chris Triantafillis &lt;christriant1995@gmail.com&gt;</property>
+    <property name="translator_credits" translatable="yes">Chris Triantafillis</property>
     <property name="logo">../media/mangar.svg</property>
     <property name="wrap_license">True</property>
     <property name="license_type">gpl-3-0</property>

diff --git a/data/ui/MangarWindow.ui b/data/ui/MangarWindow.ui
@@ -159,31 +159,6 @@
           <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuItem" id="mne_file">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Αρχείο</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem5">
-                        <property name="label">gtk-quit</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
             <child>
               <object class="GtkMenuItem" id="mnu_edit">
                 <property name="use_action_appearance">False</property>
@@ -424,13 +399,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolItem" id="progressbaritem">
+              <object class="GtkToolItem" id="spinneritem">
                 <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>
                 <child>
-                  <object class="GtkProgressBar" id="progressbar">
+                  <object class="GtkSpinner" id="spinner">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>

diff --git a/mangar/MangarWindow.py b/mangar/MangarWindow.py
@@ -25,9 +25,10 @@
 import zipfile
 import subprocess
 import shutil
+import pickle
 
 home = os.getenv('HOME')
-images_folder = home + "/.config/mangar/images/"
+images_folder = home + "/.config/mangar/"
 extensions = [ ".cbz", ".cbr", ".cb7" ]
 collection = {}
 
@@ -45,7 +46,7 @@ def finish_initializing(self, builder): # pylint: disable=E1002
 		self.collection_folder = self.settings.get_string("collectionfolder")
 		self.output_folder = self.settings.get_string("outputfolder")
 
-        #collection = self.settings.get_string_array("collectionarray")
+        collection = self.load_collection()
         self.set_collection_to_collectiontreeview(collection)
 
         modecombo = self.builder.get_object("modecombobox")
@@ -56,22 +57,34 @@ def finish_initializing(self, builder): # pylint: disable=E1002
         self.tempfolder = tempfile.mkdtemp()
         print self.tempfolder
         self.images = []
-
+
+        self.spinner = self.builder.get_object("spinner")
+        self.spinner.start()
+		self.spinner.hide()
+
         # Code for other initialization actions should be added here.
 
-    def my_on_mangatreeview_cursor_changed(self, widget, user_param=None):		
+    def my_on_mangatreeview_cursor_changed(self, widget, user_param=None):
+		#self.spinner.show()
+		#self.spinner.start()	
+		#self.set_spinner()
 		manga = self.get_selected_manga(0)
 		url = self.get_manga_url(manga)
 		episode = self.get_last_episode(url)
 		self.set_episodes_to_treeview(manga, episode)
 
+	def set_spinner(self):
+		self.spinner.show()
 
     def my_on_episodetreeview_row_activated(self, widget, path, user_param=None):
+		#spinner = self.builder.get_object("spinner")
+		self.set_spinner()
+
 		manga = self.get_selected_manga(0)
 		manga_url = self.get_manga_url(manga)
 		episode_number = self.get_selected_episode()
 		first_episode_line = self.find_first_episode_line(manga, manga_url)
-		
+
 		episode_line = ""
 		if manga == "High School of the Dead":
 			episode_line = self.get_episode_line(manga, manga_url, first_episode_line, episode_number, True)
@@ -86,19 +99,22 @@ def my_on_episodetreeview_row_activated(self, widget, path, user_param=None):
 		self.set_pages_to_combobox(pages_number)
 		i = 1
 		episodes_url = final_episode_url
+		self.images = []
 		while ( i != pages_number + 1):
 			self.download_image(episodes_url, manga, episode_number, i)
 			episodes_url = final_episode_url
 			i = i + 1
 			episodes_url = episodes_url + "/" + str(i)
-		print self.images
+		bar.hide()
 		self.ui.mangaimage.set_from_file(self.images[0])
+		spinner.stop()
 		scrolledwindow = self.builder.get_object("imagescrolledwindow")
 		scrolledwindow.set_property("min-content-width", 900)
 
 	def my_on_previousbutton_clicked(self, button, user_param=None):
 		page = self.ui.pagescellrenderer.get_property("text")
 		page = int(page)
+		print("page is {0}".format(page))
 		mangaimage = self.builder.get_object("mangaimage")
 		combobox = self.builder.get_object("pagecombobox")
 		if page != 1:
@@ -122,23 +138,20 @@ def my_on_previousbutton_clicked(self, button, user_param=None):
 	def my_on_nextbutton_clicked(self, button, user_param=None):
 		page = self.ui.pagescellrenderer.get_property("text")
 		page = int(page)
-		print page
+		print("page is {0}".format(page))
 		mangaimage = self.builder.get_object("mangaimage")
 		combobox = self.builder.get_object("pagecombobox")
 		pages_number = combobox.get_row_span_column()
 		if page != pages_number:
 			next_page = page + 1
-			print next_page
+			print("next page is {0}".format(next_page))
 			self.notebook = self.builder.get_object("notebook")
 			notebookpage = self.notebook.get_current_page()
 			if notebookpage == 0:
-				if next_page == 2:
-					mangaimage.set_from_file(self.images[1])
-				else:
-					image = self.images[page]
-					print image
-					mangaimage.clear()
-					mangaimage.set_from_file(image)
+				image = self.images[page]
+				print("image is {0}".format(image))
+				mangaimage.clear()
+				mangaimage.set_from_file(image)
 			else:
 				manga = self.get_selected_manga(1)
 				image = self.images[page]
@@ -151,12 +164,9 @@ def my_on_pagecombobox_changed(self, combobox, param=None):
 		self.notebook = self.builder.get_object("notebook")
 		notebookpage = self.notebook.get_current_page()
 		imagewidget = self.builder.get_object("mangaimage")		
-		page = str(combobox.get_active())
+		page = int(combobox.get_active())
 		if notebookpage == 0:
-			manga = self.get_selected_manga(0)
-			episode = str(self.get_selected_episode())
-			image_path = self.tempfolder + "/" + manga + "-" + episode + "-" + page + ".jpg"
-			imagewidget.set_from_file(image_path)
+			imagewidget.set_from_file(self.images[page])
 		else:
 			manga = self.get_selected_manga(1)
 			page = int(page)
@@ -179,7 +189,8 @@ def my_on_collectiontreeview_row_activated(self, widget, path, param=None):
 		treeselection = collectiontree.get_selection()
 		treemodel, treeiter = treeselection.get_selected()
 		manga = treemodel.get_value(treeiter, 0)
-		location = collection[manga]
+		#location = collection[manga]
+		location = self.collection_folder + "/" + manga
 		folder = self.tempfolder + "/" + manga
 		if not os.path.exists(folder):
 			os.mkdir(folder, 0700)
@@ -196,23 +207,30 @@ def my_on_scan_menuitem_activate(self, item , param=None):
 		collection_array = []
 		for key in collection:
 			collection_array.append(key)
+		self.store_collection(collection)
 		self.set_collection_to_collectiontreeview(collection_array)
 
 	def my_on_hidemenuitem_toggled(self, checkitem, param=None):
 		checkitem = self.builder.get_object("hidemenuitem")
+		button = self.builder.get_object("hidebutton")
 		box = self.builder.get_object("box3")
 		if checkitem.get_active() is True:
 			box.hide()
+			button.set_active(True)
 		else:
 			box.show()
+			button.set_active(False)
 
 	def my_on_hidebutton_toggled(self, button, param=None):
 		button = self.builder.get_object("hidebutton")
+		checkitem = self.builder.get_object("hidemenuitem")
 		box = self.builder.get_object("box3")
 		if button.get_active() is True:
 			box.hide()
+			checkitem.set_active(True)
 		else:
 			box.show()
+			checkitem.set_active(False)
 
 	def my_on_fullscreenbutton_toggled(self, button, param=None):
 		button = self.builder.get_object("fullscreenbutton")
@@ -243,6 +261,7 @@ def my_on_mangar_window_key_press_event(self, widget, event, param=None):
 		button = self.builder.get_object("fullscreenbutton")
 		checkitem = self.builder.get_object("fullscreenmenuitem")
 		scrolled = self.builder.get_object("imagescrolledwindow")
+		viewport = self.builder.get_object("viewport1")
 		keyname = Gdk.keyval_name(event.keyval)
 		if keyname == "Right":
 			button = self.builder.get_object("nextbutton")
@@ -253,12 +272,6 @@ def my_on_mangar_window_key_press_event(self, widget, event, param=None):
 		elif keyname == "Escape" and button.get_active() is True:
 			button.set_active(False)
 			checkitem.set_active(False)
-		elif keyname == "Down":
-			new_height = ""
-			height = scrolled.get_vadjustment()
-			if height != height.get_lower():
-				height.set_value( height.get_upper() - height.get_page_size() )
-				scrolled.set_vadjustment(height)
 
 	def my_on_mangar_window_destroy(self, widget, param=None):
 		shutil.rmtree(self.tempfolder)
@@ -554,6 +567,7 @@ def scan_collection(self, collection_folder):
 
 	def set_collection_to_collectiontreeview(self, collection):
 		collectionstore = self.builder.get_object("collectionstore")
+		collectionstore.clear()
 		for key in collection:
 			collectionstore.append([key])
 
@@ -567,3 +581,20 @@ def scan_images(self, location):
 			self.images.append(i)
 		self.images = sorted(self.images)
 		return self.images
+
+	def store_collection(self, collection):
+		collection_file = images_folder + "collection"
+		f = open(collection_file, 'wb')
+		pickle.dump(collection, f)
+		f.close()
+
+	def load_collection(self):
+		collection = []
+		collection_file = images_folder + "collection"
+		f = open(collection_file, 'rb')
+		try:
+			collection = pickle.load(f)
+		except EOFError:
+			 return collection
+		f.close()
+		return collection
diff --git a/mangar/MangarWindow.pyc b/mangar/MangarWindow.pyc
diff --git a/mangar/__init__.py b/mangar/__init__.py
@@ -30,8 +30,15 @@ def check_files():
 	"""Check folder"""
 	home = os.getenv('HOME')
 	program_folder = home + "/.config/mangar/"
+	collection_file = program_folder + "collection"
 	if not os.path.exists(program_folder):
 		os.mkdir(program_folder, 0700)
+	try:
+		f = open(collection_file, 'rb')
+		f.close()
+    except IOError:
+        f = open(collection_file, 'wb')
+        f.close()
 
 def main():
     'constructor for your class instances'

diff --git a/mangar/__init__.pyc b/mangar/__init__.pyc