alacarte r372 - in branches/sreeves-system-view: . Alacarte po

From: sreeves svn gnome org
To: svn-commits-list gnome org
Subject: alacarte r372 - in branches/sreeves-system-view: . Alacarte po
Date: Fri, 11 Apr 2008 21:39:54 +0100 (BST)
Author: sreeves
Date: Fri Apr 11 21:39:54 2008
New Revision: 372
URL: http://svn.gnome.org/viewvc/alacarte?rev=372&view=rev

Log:
Merge in changes from trunk -r 324:366

Added:
   branches/sreeves-system-view/po/POTFILES.skip
      - copied unchanged from r366, /trunk/po/POTFILES.skip
   branches/sreeves-system-view/po/ga.po
      - copied unchanged from r366, /trunk/po/ga.po
   branches/sreeves-system-view/po/id.po
      - copied unchanged from r366, /trunk/po/id.po
   branches/sreeves-system-view/po/io.po
      - copied unchanged from r366, /trunk/po/io.po
   branches/sreeves-system-view/po/kn.po
      - copied unchanged from r366, /trunk/po/kn.po
   branches/sreeves-system-view/po/nn.po
      - copied unchanged from r366, /trunk/po/nn.po
Modified:
   branches/sreeves-system-view/Alacarte/MainWindow.py
   branches/sreeves-system-view/Alacarte/Makefile.am
   branches/sreeves-system-view/Alacarte/MenuEditor.py
   branches/sreeves-system-view/ChangeLog
   branches/sreeves-system-view/NEWS
   branches/sreeves-system-view/README
   branches/sreeves-system-view/alacarte.desktop.in.in
   branches/sreeves-system-view/alacarte.glade
   branches/sreeves-system-view/configure.ac
   branches/sreeves-system-view/po/ChangeLog
   branches/sreeves-system-view/po/LINGUAS
   branches/sreeves-system-view/po/ar.po
   branches/sreeves-system-view/po/as.po
   branches/sreeves-system-view/po/bn.po
   branches/sreeves-system-view/po/es.po
   branches/sreeves-system-view/po/eu.po
   branches/sreeves-system-view/po/fr.po
   branches/sreeves-system-view/po/ja.po
   branches/sreeves-system-view/po/mr.po
   branches/sreeves-system-view/po/nb.po
   branches/sreeves-system-view/po/oc.po
   branches/sreeves-system-view/po/sl.po

Modified: branches/sreeves-system-view/Alacarte/MainWindow.py
==============================================================================
--- branches/sreeves-system-view/Alacarte/MainWindow.py	(original)
+++ branches/sreeves-system-view/Alacarte/MainWindow.py	Fri Apr 11 21:39:54 2008
@@ -131,6 +131,7 @@
 		self.tree.get_widget('edit_properties').set_sensitive(False)
 		self.tree.get_widget('move_up_button').set_sensitive(False)
 		self.tree.get_widget('move_down_button').set_sensitive(False)
+		self.tree.get_widget('new_separator_button').set_sensitive(False)
 		self.sysadmin.setup_ab(self.tree)
 		self.sysadmin.setup_viewmode(self.tree, self.options.systemview)
 		accelgroup = gtk.AccelGroup()
@@ -510,7 +511,15 @@
 			file_path = os.path.join(util.getUserItemPath(), item.get_desktop_file_id())
 			file_type = 'Item'
 		elif item.get_type() == gmenu.TYPE_DIRECTORY:
-			file_path = os.path.join(util.getUserDirectoryPath(), os.path.split(item.get_desktop_file_path())[1])
+			if item.get_desktop_file_path() == None:
+				file_path = util.getUniqueFileId('alacarte-made', '.directory')
+				parser = util.DesktopParser(file_path, 'Directory')
+				parser.set('Name', item.get_name())
+				parser.set('Comment', item.get_comment())
+				parser.set('Icon', item.get_icon())
+				parser.write(open(file_path))
+			else:
+				file_path = os.path.join(util.getUserDirectoryPath(), os.path.split(item.get_desktop_file_path())[1])
 			file_type = 'Menu'
 
 		if not os.path.isfile(file_path):
@@ -547,6 +556,7 @@
 		self.tree.get_widget('edit_properties').set_sensitive(False)
 		self.tree.get_widget('move_up_button').set_sensitive(False)
 		self.tree.get_widget('move_down_button').set_sensitive(False)
+		self.tree.get_widget('new_separator_button').set_sensitive(False)
 
 	def on_menu_tree_drag_data_get(self, treeview, context, selection, target_id, etime):
 		menus, iter = treeview.get_selection().get_selected()
@@ -562,6 +572,8 @@
 				context.finish(False, False, etime)
 				return False
 			if selection.target in ('ALACARTE_ITEM_ROW', 'ALACARTE_MENU_ROW'):
+				if self.drag_data == None:
+					return False
 				item = self.drag_data
 				new_parent = menus[path][2]
 				treeview.get_selection().select_path(path)
@@ -573,6 +585,7 @@
 				else:
 					context.finish(False, False, etime) 
 				context.finish(True, True, etime)
+		self.drag_data = None
 
 	def on_item_tree_show_toggled(self, cell, path):
 		item = self.item_store[path][3]
@@ -586,8 +599,11 @@
 
 	def on_item_tree_cursor_changed(self, treeview):
 		items, iter = treeview.get_selection().get_selected()
+		if iter is None:
+			return
 		item = items[iter][3]
 		self.tree.get_widget('edit_delete').set_sensitive(True)
+		self.tree.get_widget('new_separator_button').set_sensitive(True)
 		if self.editor.canRevert(item):
 			self.tree.get_widget('edit_revert_to_original').set_sensitive(True)
 		else:
@@ -647,6 +663,8 @@
 			drop_info = treeview.get_dest_row_at_pos(x, y)
 			before = None
 			after = None
+			if self.drag_data == None:
+				return False
 			item = self.drag_data
 			if drop_info:
 				path, position = drop_info
@@ -666,6 +684,8 @@
 				self.editor.moveSeparator(item, item.get_parent(), before, after)
 			context.finish(True, True, etime)
 		elif selection.target == 'text/plain':
+			if selection.data == None:
+				return False
 			menus, iter = self.tree.get_widget('menu_tree').get_selection().get_selected()
 			parent = menus[iter][2]
 			drop_info = treeview.get_dest_row_at_pos(x, y)
@@ -696,6 +716,7 @@
 				self.editor.createItem(parent, parser.get('Icon'), parser.get('Name', self.editor.locale), parser.get('Comment', self.editor.locale), parser.get('Exec'), parser.get('Terminal'), before, after)
 			elif file_info.mime_type in ('application/x-shellscript', 'application/x-executable'):
 				self.editor.createItem(parent, None, os.path.split(file_path)[1].strip(), None, file_path.replace('file://', '').strip(), False, before, after)
+		self.drag_data = None
 
 	def on_item_tree_key_press_event(self, item_tree, event):
 		if event.keyval == gtk.keysyms.Delete:
@@ -761,6 +782,9 @@
 			pass
 		gobject.timeout_add(10, self.quit)
 
+	def on_style_set(self, *args):
+		self.loadUpdates()
+
 	def quit(self):
 		self.editor.quit()
 		gtk.main_quit()		

Modified: branches/sreeves-system-view/Alacarte/Makefile.am
==============================================================================
--- branches/sreeves-system-view/Alacarte/Makefile.am	(original)
+++ branches/sreeves-system-view/Alacarte/Makefile.am	Fri Apr 11 21:39:54 2008
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-appdir = $(pyexecdir)/Alacarte
+appdir = $(pythondir)/Alacarte
 app_PYTHON = __init__.py MainWindow.py MenuEditor.py util.py SysAdmin.py
 nodist_app_PYTHON = config.py
 

Modified: branches/sreeves-system-view/Alacarte/MenuEditor.py
==============================================================================
--- branches/sreeves-system-view/Alacarte/MenuEditor.py	(original)
+++ branches/sreeves-system-view/Alacarte/MenuEditor.py	Fri Apr 11 21:39:54 2008
@@ -357,6 +357,11 @@
 			parent = parent.get_parent()
 			if parent == menu:
 				return False
+
+		#don't move a menu into itself
+		if new_parent == menu:
+			return False
+
 		#can't move between top-level menus
 		if self.__getMenu(menu) != self.__getMenu(new_parent):
 			return False
@@ -416,6 +421,9 @@
 	def revertMenu(self, menu):
 		if not self.canRevert(menu):
 			return
+		#wtf happened here? oh well, just bail
+		if not menu.get_desktop_file_path():
+			return
 		self.__addUndo([menu,])
 		file_id = os.path.split(menu.get_desktop_file_path())[1]
 		path = os.path.join(util.getUserDirectoryPath(), file_id)
@@ -443,6 +451,8 @@
 				else:
 					continue
 			elif item.get_type() == gmenu.TYPE_DIRECTORY:
+				if item.get_desktop_file_path() == None:
+					continue
 				file_path = os.path.join(util.getUserDirectoryPath(), os.path.split(item.get_desktop_file_path())[1])
 				if not os.path.isfile(file_path):
 					file_path = item.get_desktop_file_path()

Modified: branches/sreeves-system-view/NEWS
==============================================================================
--- branches/sreeves-system-view/NEWS	(original)
+++ branches/sreeves-system-view/NEWS	Fri Apr 11 21:39:54 2008
@@ -1,4 +1,86 @@
 ==============
+Version 0.11.5
+==============
+
+	* fix exception on first open of context menu
+
+Translations
+
+	- Updated nb: Kjartan Maraas
+	- Updated es: Jorge Gonzalez
+	- Updated ja: Takeshi AIHANA
+	- Updated mr: Sandeep Shedmake
+	- Updated fr: StÃphane Raimbault
+
+
+==============
+Version 0.11.4
+=============
+
+Travis Watkins:
+
+	* Lots of bug fixing
+
+Translations
+
+	- Updated el: Simos Xenitellis
+	- Updated io: Michael Terry
+	- Updated pt: Duarte Loreto
+	- Updated vi: Nguyán ThÃi Ngác Duy
+	- Updated ca: Josep Puigdemont i CasamajÃ
+	- Updated it: Luca Ferretti
+	- Updated sv: Daniel Nylander
+	- Updated cs: Jakub Friedl
+	- Updated as: Amitakhya Phukan
+	- Updated ar: Djihed Afifi <djihed gmail com>
+	- Updated ga: SeÃn de BÃrca
+	- Updated eu: Inaki Larranaga Murgoitio
+	- Updated et: Priit Laes
+	- Updated gl: Ignacio Casal Quinteiro
+	- Updated id: ahmad riza h nst
+	- Updated bn_IN: Runa Bhattacharjee
+	- Updated ru: Leonid Kanter
+	- Updated uz cyrillic: Claude Paroz
+	- Updated sr.po, sr Latn: Goran RakiÄ
+	- Updated nn: Kjartan Maraas
+	- Updated nb: Kjartan Maraas
+	- Updated tr: Baris Cicek
+	- Updated lv: Raivis Dejus
+	- Updated lt: Gintautas Miliauskas
+	- Updated gu: Ankit Patel
+	- Updated te: Sunil Mohan Adapa
+	- Updated pl: Artur Flinta
+	- Updated ta: I Felix
+	- Updated en_CA: Adam Weinberger
+	- Updated fr: StÃphane Raimbault
+	- Updated bg: Alexander Shopov
+	- Updated pt_BR: Leonardo Ferreira Fontenelle
+	- Updated bn: Khandakar Mujahidul Islam
+	- Updated zh_TW: Taiwan
+	- Updated ko: Changwoo Ryu
+	- Updated hu: Gabor Kelemen
+	- Updated dz: Pema Geyleg
+	- Updated fi: Ilkka Tuohela
+	- Updated da: Lasse Bang Mikkelsen
+	- Updated ja: Takeshi AIHANA
+	- Updated he: Yair Hershkovitz
+	- Updated mg: Thierry Randrianiriana
+	- Updated be latin: Ihar Hrachyshka
+	- Updated zh_CN: Funda Wang
+	- Updated ml: Ani Peter
+	- Updated sq: Laurent Dhima
+	- Updated oc: Yannig Marchegay, Christophe Merlet, Kokoyaya
+	- Updated kn: Pramod Raghavendra
+	- Updated mk: Daniel Nylander
+	- Updated zh_HK: Hong Kong
+	- Updated de: Hendrik Richter
+	- Updated en_GB: British
+	- Updated uk: Maxim Dziumanenko
+	- Updated sl: Matej UrbanÄiÄ, Matic Zgur
+	- Updated nl: Vincent van Adrighem, Wouter Bolsterlee
+
+
+==============
 Version 0.11.3
 ==============
 

Modified: branches/sreeves-system-view/README
==============================================================================
--- branches/sreeves-system-view/README	(original)
+++ branches/sreeves-system-view/README	Fri Apr 11 21:39:54 2008
@@ -1,4 +1,4 @@
-Alacarte 0.11.3
+Alacarte 0.11.5
 ===============
 
 Alacarte is a menu editor for GNOME using the freedesktop.org menu

Modified: branches/sreeves-system-view/alacarte.desktop.in.in
==============================================================================
--- branches/sreeves-system-view/alacarte.desktop.in.in	(original)
+++ branches/sreeves-system-view/alacarte.desktop.in.in	Fri Apr 11 21:39:54 2008
@@ -5,7 +5,7 @@
 Exec=alacarte
 Terminal=false
 Type=Application
-StartupNotify=true
+StartupNotify=false
 Categories=GNOME;Settings;DesktopSettings;
 NotShowIn=KDE;
 Icon=alacarte

Modified: branches/sreeves-system-view/alacarte.glade
==============================================================================
--- branches/sreeves-system-view/alacarte.glade	(original)
+++ branches/sreeves-system-view/alacarte.glade	Fri Apr 11 21:39:54 2008
@@ -72,6 +72,7 @@
   <property name="has_separator">False</property>
   <signal name="close" handler="on_close_button_clicked" last_modification_time="Wed, 26 Apr 2006 18:46:45 GMT"/>
   <signal name="destroy" handler="on_close_button_clicked" last_modification_time="Fri, 28 Apr 2006 10:49:37 GMT"/>
+  <signal name="style-set" handler="on_style_set"/>
   <accelerator key="Escape" modifiers="0" signal="close"/>
 
   <child internal-child="vbox">

Modified: branches/sreeves-system-view/configure.ac
==============================================================================
--- branches/sreeves-system-view/configure.ac	(original)
+++ branches/sreeves-system-view/configure.ac	Fri Apr 11 21:39:54 2008
@@ -1,7 +1,7 @@
 dnl -*- Mode: autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
-AC_INIT(alacarte, 0.11.4, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
+AC_INIT(alacarte, 0.11.5, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
 AC_CONFIG_SRCDIR(alacarte.in)
 AM_INIT_AUTOMAKE([1.7])
 AM_MAINTAINER_MODE

Modified: branches/sreeves-system-view/po/LINGUAS
==============================================================================
--- branches/sreeves-system-view/po/LINGUAS	(original)
+++ branches/sreeves-system-view/po/LINGUAS	Fri Apr 11 21:39:54 2008
@@ -22,13 +22,17 @@
 fa
 fi
 fr
+ga
 gl
 gu
 hi
 hu
+id
+io
 it
 ja
 ka
+kn
 ko
 ku
 lt
@@ -40,6 +44,7 @@
 mr
 nb
 nl
+nn
 oc
 or
 pa
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]