@@ -61,54 +61,44 @@ <placeholder/> </child> <child> - <widget class="GtkEntry" id="rights_auto"> + <widget class="GtkEntry" id="description_auto"> <property name="visible">True</property> + <property name="can_focus">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label3"> + <widget class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Copyright Notice:</property> + <property name="label" translatable="yes">Creator:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_EXPAND</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="creator_auto"> - <property name="visible">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <widget class="GtkLabel" id="label7"> + <widget class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Description:</property> + <property name="label" translatable="yes">Title:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> @@ -123,44 +113,54 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label5"> + <widget class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Title:</property> + <property name="label" translatable="yes">Description:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <widget class="GtkLabel" id="label9"> + <widget class="GtkEntry" id="creator_auto"> + <property name="visible">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Creator:</property> + <property name="label" translatable="yes">Copyright Notice:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <widget class="GtkEntry" id="description_auto"> + <widget class="GtkEntry" id="rights_auto"> <property name="visible">True</property> - <property name="can_focus">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> </packing> </child> </widget> @@ -354,123 +354,6 @@ <property name="tab_fill">False</property> </packing> </child> - <child> - <widget class="GtkVBox" id="vbox10"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="spacing">18</property> - <property name="homogeneous">True</property> - <child> - <widget class="GtkVBox" id="vbox13"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkLabel" id="label61"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">&lt;span weight="bold"&gt;Other Fields&lt;/span&gt;</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="left_padding">12</property> - <child> - <widget class="GtkVBox" id="vbox14"> - <property name="visible">True</property> - <property name="spacing">3</property> - <child> - <widget class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="spacing">3</property> - <child> - <widget class="GtkLabel" id="label62"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Filter key:</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="entry9"> - <property name="visible">True</property> - <property name="text" translatable="yes">N/A just a mockup</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <child> - <widget class="GtkViewport" id="viewport2"> - <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="label63"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">tabella -field | value</property> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="Advanced"> - <property name="visible">True</property> - <property name="label" translatable="yes">Advanced</property> - </widget> - <packing> - <property name="type">tab</property> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> </widget> <packing> <property name="position">1</property> data/xmpmanager/nautilus-xmp-manager.glade @@ -60,54 +60,44 @@ <placeholder/> </child> <child> - <object class="GtkEntry" id="rights_auto"> + <object class="GtkEntry" id="description_auto"> <property name="visible">True</property> + <property name="can_focus">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"/> </packing> </child> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Copyright Notice:</property> + <property name="label" translatable="yes">Creator:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_EXPAND</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="creator_auto"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Description:</property> + <property name="label" translatable="yes">Title:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> @@ -122,44 +112,54 @@ </packing> </child> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Title:</property> + <property name="label" translatable="yes">Description:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </object> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <object class="GtkLabel" id="label9"> + <object class="GtkEntry" id="creator_auto"> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Creator:</property> + <property name="label" translatable="yes">Copyright Notice:</property> <property name="justify">GTK_JUSTIFY_RIGHT</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <object class="GtkEntry" id="description_auto"> + <object class="GtkEntry" id="rights_auto"> <property name="visible">True</property> - <property name="can_focus">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"/> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> </packing> </child> </object> @@ -344,119 +344,6 @@ <property name="tab_fill">False</property> </packing> </child> - <child> - <object class="GtkVBox" id="vbox10"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="spacing">18</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkVBox" id="vbox13"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label61"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">&lt;span weight="bold"&gt;Other Fields&lt;/span&gt;</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="left_padding">12</property> - <child> - <object class="GtkVBox" id="vbox14"> - <property name="visible">True</property> - <property name="spacing">3</property> - <child> - <object class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="spacing">3</property> - <child> - <object class="GtkLabel" id="label62"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Filter key:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry9"> - <property name="visible">True</property> - <property name="text" translatable="yes">N/A just a mockup</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <child> - <object class="GtkViewport" id="viewport2"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label63"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">tabella -field | value</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - </packing> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="Advanced"> - <property name="visible">True</property> - <property name="label" translatable="yes">Advanced</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> </object> <packing> <property name="position">1</property> data/xmpmanager/nautilus-xmp-manager.ui @@ -23,10 +23,10 @@ class Selection # backend specific methods include XmpManager::Exiftool - def initialize(*paths) + def initialize(paths) # clean *paths ARGV ? - #*paths = 'spec/images/write-tests/a.jpg', 'spec/images/write-tests/b.jpg' if DEBUG - @files = load_files(*paths) # return a File Array + #paths = 'spec/images/write-tests/a.jpg', 'spec/images/write-tests/b.jpg' if DEBUG + @files = load_files(paths) # return a File Array @field, @status, @tags = {}, {}, {} #@field, @status, @tags = load_selection # from @files @@ -86,7 +86,7 @@ class Selection private - def load_files(*paths) + def load_files(paths) files = [] paths.each do |path| files << XmpManager::File.new(path) lib/xmpmanager/selection.rb @@ -21,7 +21,7 @@ module XmpManager class MainWindow def initialize - @selection = XmpManager::Selection.new(ARGV[0]) + @selection = XmpManager::Selection.new(ARGV) init_gui end @@ -47,7 +47,6 @@ class MainWindow eval <<-END @#{name}.text = @selection.#{name} @#{name}.signal_connect('changed') do - puts "@#{name}"+"="+@#{name}.text @selection.#{name} = @#{name}.text end END lib/xmpmanager/ui/gtk.rb @@ -29,6 +29,12 @@ APP_LOGO_FILENAME = '' GCONF_ROOT = '/apps/xmp-manager' +if ARGV.empty? + puts 'you should specify at list a file' #TODO: Gtk error + exit 1 +end + + require 'xmpmanager/selection' require 'xmpmanager/ui/gtk' xmp-manager c375a68ef27f48f1b2936341c76383b53ae0f19e Luigi Maselli luigix_@t_gmail_com http://github.com/grigio/xmp-manager/commit/51756e76bafcc4a303980d65e14ffd7812922475 51756e76bafcc4a303980d65e14ffd7812922475 2009-02-03T02:55:06-08:00 2009-02-03T02:55:06-08:00 Fixed multiple exiftool save ed70f0f6cf586db4f4065f0b6ba7db8211a12ac4 Luigi Maselli luigix_@t_gmail_com