alacarte r408 - in branches/sreeves-system-view: . data po

From: sreeves svn gnome org
To: svn-commits-list gnome org
Subject: alacarte r408 - in branches/sreeves-system-view: . data po
Date: Sat, 17 Jan 2009 01:02:23 +0000 (UTC)
Author: sreeves
Date: Sat Jan 17 01:02:23 2009
New Revision: 408
URL: http://svn.gnome.org/viewvc/alacarte?rev=408&view=rev

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

Added:
   branches/sreeves-system-view/data/
      - copied from r400, /trunk/data/
   branches/sreeves-system-view/data/alacarte-system.desktop.in.in   (props changed)
      - copied unchanged from r407, /branches/sreeves-system-view/alacarte-system.desktop.in.in
   branches/sreeves-system-view/po/fur.po
      - copied unchanged from r400, /trunk/po/fur.po
   branches/sreeves-system-view/po/hr.po
      - copied unchanged from r400, /trunk/po/hr.po
   branches/sreeves-system-view/po/ps.po
      - copied unchanged from r400, /trunk/po/ps.po
   branches/sreeves-system-view/po/sk.po
      - copied unchanged from r400, /trunk/po/sk.po
   branches/sreeves-system-view/po/sr latin po
      - copied unchanged from r400, /trunk/po/sr latin po
Removed:
   branches/sreeves-system-view/alacarte-system.desktop.in.in
   branches/sreeves-system-view/alacarte.desktop.in.in
   branches/sreeves-system-view/alacarte.glade
   branches/sreeves-system-view/logo.svg
   branches/sreeves-system-view/po/sr Latn po
Modified:
   branches/sreeves-system-view/   (props changed)
   branches/sreeves-system-view/ChangeLog
   branches/sreeves-system-view/Makefile.am
   branches/sreeves-system-view/NEWS
   branches/sreeves-system-view/README
   branches/sreeves-system-view/configure.ac
   branches/sreeves-system-view/data/Makefile.am
   branches/sreeves-system-view/data/alacarte.desktop.in.in
   branches/sreeves-system-view/data/alacarte.glade
   branches/sreeves-system-view/po/ChangeLog
   branches/sreeves-system-view/po/LINGUAS
   branches/sreeves-system-view/po/POTFILES.in
   branches/sreeves-system-view/po/POTFILES.skip
   branches/sreeves-system-view/po/ar.po
   branches/sreeves-system-view/po/el.po
   branches/sreeves-system-view/po/hu.po
   branches/sreeves-system-view/po/ml.po
   branches/sreeves-system-view/po/oc.po
   branches/sreeves-system-view/po/or.po
   branches/sreeves-system-view/po/pl.po
   branches/sreeves-system-view/po/pt_BR.po
   branches/sreeves-system-view/po/ru.po

Modified: branches/sreeves-system-view/Makefile.am
==============================================================================
--- branches/sreeves-system-view/Makefile.am	(original)
+++ branches/sreeves-system-view/Makefile.am	Sat Jan 17 01:02:23 2009
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po Alacarte
+SUBDIRS = data po Alacarte
 
 CLEANFILES=
 
@@ -12,14 +12,6 @@
 
 install-data-local:
 
- INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = alacarte.desktop.in alacarte-system.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-EXTRA_DIST += $(desktop_in_files)
-CLEANFILES += $(desktop_DATA)
-
 alacarte: alacarte.in
 	sed -e s!\ PYTHON\@! PYTHON@!		\
 	    -e s!\ PYOPTIONS\@!-OOt!		\
@@ -27,24 +19,3 @@
 alacarte: Makefile
 
 EXTRA_DIST += alacarte.in
-
-pkgdata_DATA = alacarte.glade logo.svg
-EXTRA_DIST += $(pkgdata_DATA)
-
-icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = alacarte.png
-EXTRA_DIST += $(icon_DATA)
-svgicondir = $(datadir)/icons/hicolor/scalable/apps
-svgicon_DATA = alacarte.svg
-EXTRA_DIST += $(svgicon_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated. After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi

Modified: branches/sreeves-system-view/NEWS
==============================================================================
--- branches/sreeves-system-view/NEWS	(original)
+++ branches/sreeves-system-view/NEWS	Sat Jan 17 01:02:23 2009
@@ -1,4 +1,30 @@
 ==============
+Version 0.11.6
+==============
+
+Misc
+
+	* install/uninstall more theme icons more correctly (Fabricio Silva,
+	  Michael Monreal, Vincent Untz)
+	* Check for python 2.6
+
+Translations
+
+	- Updated ar: Khaled Hosny
+	- Updated el: Simos Xenitellis
+	- Updated fur: Massimo Furlani
+	- Updated hr: Ante KaramatiÄ
+	- Updated hu: Gabor Kelemen
+	- Updated ml: Ani Peter
+	- Updated oc: Yannig Marchegay (Kokoyaya)
+	- Updated or: Manoj Kumar Giri
+	- Updated pl: Tomasz Dominikowski
+	- Updated ps: Zabeeh Khan
+	- Updated pt_BR: Vladimir Melo
+	- Updated ru: Nickolay V. Shmyrev
+	- Updated sk: Marcel Telka
+
+==============
 Version 0.11.5
 ==============
 

Modified: branches/sreeves-system-view/README
==============================================================================
--- branches/sreeves-system-view/README	(original)
+++ branches/sreeves-system-view/README	Sat Jan 17 01:02:23 2009
@@ -1,4 +1,4 @@
-Alacarte 0.11.5
+Alacarte 0.11.6
 ===============
 
 Alacarte is a menu editor for GNOME using the freedesktop.org menu

Modified: branches/sreeves-system-view/configure.ac
==============================================================================
--- branches/sreeves-system-view/configure.ac	(original)
+++ branches/sreeves-system-view/configure.ac	Sat Jan 17 01:02:23 2009
@@ -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.5, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
+AC_INIT(alacarte, 0.11.6, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
 AC_CONFIG_SRCDIR(alacarte.in)
 AM_INIT_AUTOMAKE([1.7])
 AM_MAINTAINER_MODE
@@ -19,7 +19,7 @@
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
-AM_PATH_PYTHON_VERSION(2.4, 2.4.0, 2.5, 2.5.0)
+AM_PATH_PYTHON_VERSION(2.6, 2.6.0, 2.5, 2.5.0, 2.4, 2.4.0)
 
 PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.15)
 
@@ -54,8 +54,10 @@
         Makefile
         po/Makefile.in
         Alacarte/Makefile
-        alacarte-system.desktop.in
-        alacarte.desktop.in
+        data/alacarte-system.desktop.in
+        data/alacarte.desktop.in
+	data/Makefile
+	data/icons/Makefile
         ])
 
 AC_OUTPUT

Modified: branches/sreeves-system-view/data/Makefile.am
==============================================================================
--- /trunk/data/Makefile.am	(original)
+++ branches/sreeves-system-view/data/Makefile.am	Sat Jan 17 01:02:23 2009
@@ -3,7 +3,7 @@
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files = alacarte.desktop.in
+desktop_in_files = alacarte.desktop.in alacarte-system.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 pkgdata_DATA = alacarte.glade

Modified: branches/sreeves-system-view/data/alacarte.desktop.in.in
==============================================================================
--- /trunk/data/alacarte.desktop.in.in	(original)
+++ branches/sreeves-system-view/data/alacarte.desktop.in.in	Sat Jan 17 01:02:23 2009
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Main Menu
+_Name=Main Menu - User view
 _Comment=Change which applications are shown on the main menu
 Exec=alacarte
 Terminal=false

Modified: branches/sreeves-system-view/data/alacarte.glade
==============================================================================
--- /trunk/data/alacarte.glade	(original)
+++ branches/sreeves-system-view/data/alacarte.glade	Sat Jan 17 01:02:23 2009
@@ -139,6 +139,110 @@
       </child>
 
       <child>
+	<widget class="GtkVBox" id="vbox7">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">3</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label25">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Editing Mode</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox22">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkCheckButton" id="system_view_button">
+		  <property name="visible">True</property>
+		  <property name="sensitive">False</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">System View</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">False</property>
+		  <property name="active">True</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">20</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox23">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkCheckButton" id="user_view_button">
+		  <property name="visible">True</property>
+		  <property name="sensitive">False</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">User View</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">False</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">20</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
 	<widget class="GtkAlignment" id="alignment9">
 	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
@@ -704,6 +808,64 @@
 	  <property name="fill">True</property>
 	</packing>
       </child>
+
+      <child>
+	<widget class="GtkHBox" id="hbox21">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">7</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label26">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Application Browser: Max items in &quot;New Applications&quot; Group</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkSpinButton" id="ab_newapps_max_spin">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="climb_rate">1</property>
+	      <property name="digits">0</property>
+	      <property name="numeric">True</property>
+	      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+	      <property name="snap_to_ticks">True</property>
+	      <property name="wrap">False</property>
+	      <property name="adjustment">1 0 1000 1 10 10</property>
+	      <signal name="value_changed" handler="on_ab_newapps_max_activate" last_modification_time="Thu, 11 Jan 2007 22:09:29 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
     </widget>
   </child>
 </widget>

Modified: branches/sreeves-system-view/po/LINGUAS
==============================================================================
--- branches/sreeves-system-view/po/LINGUAS	(original)
+++ branches/sreeves-system-view/po/LINGUAS	Sat Jan 17 01:02:23 2009
@@ -22,10 +22,13 @@
 fa
 fi
 fr
+fur
 ga
 gl
 gu
+he
 hi
+hr
 hu
 id
 io
@@ -49,15 +52,17 @@
 or
 pa
 pl
+ps
 pt
 pt_BR
 ro
 ru
 si
+sk
 sl
 sq
 sr
-sr Latn
+sr latin
 sv
 ta
 te

Modified: branches/sreeves-system-view/po/POTFILES.in
==============================================================================
--- branches/sreeves-system-view/po/POTFILES.in	(original)
+++ branches/sreeves-system-view/po/POTFILES.in	Sat Jan 17 01:02:23 2009
@@ -1,5 +1,5 @@
 [encoding: UTF-8]
 Alacarte/MainWindow.py
 Alacarte/MenuEditor.py
-alacarte.desktop.in.in
-alacarte.glade
+data/alacarte.desktop.in.in
+data/alacarte.glade

Modified: branches/sreeves-system-view/po/POTFILES.skip
==============================================================================
--- branches/sreeves-system-view/po/POTFILES.skip	(original)
+++ branches/sreeves-system-view/po/POTFILES.skip	Sat Jan 17 01:02:23 2009
@@ -1 +1 @@
-alacarte.desktop.in
+data/alacarte.desktop.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]