etti 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83cacfc33d97ca9758d06d8a3edfec4290788d67
-  data.tar.gz: 73f4b727abe2a4a3fe4fd7a7a6eff42ec7b16a95
+  metadata.gz: 01d2ab51124b22c47e91b53f203896608f6864ba
+  data.tar.gz: 751753191c55665d7765dd7e16b84a701ce172d0
 SHA512:
-  metadata.gz: d13a5be38ab88fbf6a872571e2b412f8677114b408e4c82fb7ae5e8a73ccb513666c6ad82e632331c5ac4e8d99687eb3d53430b2609bd4d39a8929297233429a
-  data.tar.gz: 0147dd1c2a9c685656a7d6189343dbcd0e47a875ec6d9ae887456cb228925bb0f58a82e6c1ebd3d31d6d10ab9a0fb127161940c2130f4661f3c32aced0863508
+  metadata.gz: daf955706b9dac4c9ddd464c4732a848853b807bd56ed6016e835748c392827ca61b51f3cfc4e979d51aa378cbbd1e57fbb290f38bfc7984ccda574f0e11cace
+  data.tar.gz: 6ad7f544fd18741f19094ff9410bba699002f475697ebbcf7945abb321035dc90ec905ffed8f8bd19c3db60e663a48db1cf8cf308cf34e44c5da372f7a7ccc52

data/bin/etti

@@ -3,6 +3,8 @@
 
 require 'etti'
 
+$etti_developement_version = true
+
 window = Etti::Window.new
 window.show_all
 window.dataPage.update_data_preview 0

data/lib/etti/elements/data.rb

@@ -42,6 +42,20 @@ module Etti
             end
 
 
+            def to_h
+                hs = {}
+                if @showAs == SHOW_AS_TEXT
+                    hs['showAs'] = 'text'
+                else
+                    hs['showAs'] = 'qr'
+                    ['qrWidth', 'qrHeight', 'qrVersion', 'qrErrorCorrection', 'qrEncoding'].each do |name|
+                        hs[name] = get_by_name name
+                    end
+                end
+                hs.merge super()
+            end
+
+
             def draw_selection view
                 if @showAs == SHOW_AS_TEXT
                     super

data/lib/etti/elements/text.rb

@@ -9,6 +9,7 @@ module Etti
                 @size = size || 4.0
             end
 
+            # x, y, rotation, color have to be moved to the Etti::Element::Base class
             def set_by_name name, val
                 if name == 'text'               then @text = val;               return; end
                 if name == 'pos_x'              then @x = val.to_f;             return; end
@@ -29,6 +30,16 @@ module Etti
             end
 
 
+            def to_h
+                hs = {}
+                ['text', 'pos_x', 'pos_y', 'size', 'rotation', 'color'].each do |name|
+                    hs[name] = get_by_name name
+                end
+                hs
+#                hs.merge super
+            end
+
+
             def redraw
 
             end

data/lib/etti/page-datas.rb

@@ -15,6 +15,8 @@ module Etti
         def initialize
             super()
             
+            @pageDimensions = {'a4' => [297.0, 210.0]}
+            
             @pageDatas = {}
             @dataFiles = [DATA_PATH + 'page-data.json',
                           File.expand_path('~') + '/.local/share/etti/page-data.json']
@@ -58,13 +60,18 @@ module Etti
         end
         
         
-        def save_page_data page, &callback
+        def get_page_dimensions size
+            @pageDimensions[size]
+        end
+        
+        
+        def save_page_data page, savePage, &callback
             FileUtils.mkdir_p File.dirname(@dataFiles.last)
-            if @pageDatas.key? page[:name]
+            if savePage and @pageDatas.key? page[:name]
                 message = _("The page description\n\"%s\"\nalready exist.\n\nSould it be replaced?") % page[:name]
             
                 ret = callback.call :warning, :yes_no, message
-                return unless ret == 'yes'
+                return nil unless ret == 'yes'
             end
             # header
             json = {'Etti' => 'page data file',
@@ -76,30 +83,35 @@ module Etti
                 json['Data'][key] = val if val[:source] == 1
             end
             
-            hs = nil
+            pageHash = nil
             newPage = !@pageDatas.key?(page[:name])
             
             # fill the current or new page with the page data from the UI
             if newPage
-                hs = {}
+                pageHash = {}
             else
-                hs = @pageDatas[page[:name]]
+                pageHash = @pageDatas[page[:name]]
             end
             FIELDS.each do |key|
-                hs[key.to_s] = page[key]
+                pageHash[key.to_s] = page[key]
             end
             
-            json['Data'][page[:name]] = hs
+            json['Data'][page[:name]] = pageHash
             
-            if newPage
-                hs['source'] = 1
-                @pageDatas[page[:name]] = hs
-                signal_emit :new_page, [page[:name], hs] 
+            if savePage and newPage
+                pageHash['source'] = 1
+                @pageDatas[page[:name]] = pageHash
+                signal_emit :new_page, [page[:name], pageHash] 
             end
             
+            return pageHash unless savePage
             fd = File.new @dataFiles.last, File::CREAT|File::TRUNC|File::RDWR, 0644
-            fd.write JSON.pretty_generate json
+            fileData = $etti_developement_version ? JSON.pretty_generate(json) : JSON.fast_generate(json)
+            fd.write fileData
             fd.flush
+            
+            # we need pageHash also in saving the complete document
+            pageHash
         end
         
 private

data/lib/etti/ui/data-page.rb

@@ -34,6 +34,28 @@ module Etti
         end
 
 
+        def get_user_settings
+            settings = {}
+            section = @radioRevealer.active
+            if section == 0
+                settings['section'] = 'enumeration'
+                settings['prefix'] = @dataEntries[0].text
+                settings['string'] = @dataEntries[1].text
+                settings['postfix'] = @dataEntries[2].text
+            elsif section == 1
+            
+            
+            end
+            settings
+        end
+
+
+        def set_user_settings
+        
+        
+        end
+
+
         def update_data_preview idx
             # data from enumeration
             if idx == 0

data/lib/etti/ui/label-elements.rb

@@ -65,6 +65,7 @@ module Etti
             cc.font_size = 16.0
             cc.show_text text
             cc.stroke
+            # remove this, if we switch to a newer ruby-gtk version dependency, and keep the from_surface call
             pixbuf = nil
             if ([2, 2, 2] <=> Gtk::BINDING_VERSION) < 1
                 pixbuf = Gdk::Pixbuf.from_surface surface, 0, 0, ext.width, ext.height * 1.5

data/lib/etti/ui/label-layout-page.rb

@@ -6,24 +6,23 @@ module Etti
         GetText.bindtextdomain 'etti', :path => Etti::LOCALE_PATH
 
         def initialize
-            super :vertical
-            @printPageSetup = nil
+            super :vertical #:orientation => :vertical
             
-            create_toolbar
-            self.pack_start @toolbar, :expand => false, :fill => false, :padding => 6
-
             hbox = Gtk::Box.new :horizontal
             self.pack_start hbox, :expand => true, :fill => true
-
+  
             create_property_view
-            hbox.pack_start @propertyView, :expand => false, :fill => false
-
+            hbox.pack_start @propertyView, :expand => false, :fill => false, :padding => 6
+            
             paned = Gtk::Paned.new :horizontal
             hbox.pack_start paned, :expand => true, :fill => true
 
             @layoutPreview = Etti::LabelLayout.new @propertyViews
             paned.pack1 @layoutPreview, :resize => true, :shrink => true
-
+#            @layoutPreview.signal_connect(:element_count_changed) do |widget, count|
+#                @saveButton.sensitive = (count > 0 and @saveButtonActivated)
+#                @saveAsButton.sensitive = count > 0
+#            end
 
             ebox = Gtk::Box.new :horizontal
 
@@ -36,8 +35,30 @@ module Etti
             @labelElements = Etti::LabelElements.new
             ebox.pack_start @labelElements, :expand => true, :fill => true
         end
+        attr_reader :layoutPreview
+
+        def get_user_settings
+            settings = {}
+            settings['scale'] = @layoutPreview.scale
+            settings['centerX'] = @layoutPreview.centerX
+            settings['centerY'] = @layoutPreview.centerY
+            elementData = []
+            @layoutPreview.elements.each {|element| elementData << element.to_h}
+            settings['elements'] = elementData
+        end
+        
+        def set_user_settings
+        
+        end
 
 
+=begin
+        def activate_save state
+            @saveButtonActivate = state
+            @saveButton.sensitive = (state and @layoutPreview.elements.length() > 0)
+        end
+=end
+
         def update_page_data pageData
             @pageData = pageData
             @layoutPreview.update_page_data pageData
@@ -83,46 +104,62 @@ module Etti
             end
         end
 
-
-        def create_toolbar
-            @toolbar = Gtk::Box.new :horizontal
 =begin
-            @fontButton = Gtk::FontButton.new
-            @toolbar.pack_start @fontButton, :expand => false, :fill => false
-            @fontButton.use_font = true
-
-            texts = ['a'..'z', 'A'..'Z']
-            text = ''
-            texts.each {|txt| text += txt.to_a.join}
-            @fontButton.preview_text = text
-=end
+        def create_toolbar
+            toolbar = Gtk::Box.new :horizontal
+            toolbarData = [{:stock => Gtk::Stock::OPEN,
+                            :method => proc{on_open},
+                            :tooltip => _('open a new document')},
+                           {:stock => Gtk::Stock::SAVE,
+                            :method => proc{on_save true},
+                            :tooltip => _('save the document')},
+                           {:stock => Gtk::Stock::SAVE_AS,
+                            :method => proc{on_save false},
+                            :tooltip => _('save the document under a new name')},
+                           {:stock => Gtk::Stock::PRINT,
+                            :method => proc{on_print},
+                            :tooltip => _('print the labels')},
+                            :separator,
+                           {:stock => Gtk::Stock::ZOOM_IN,
+                            :method => proc{@layoutPreview.zoom_in},
+                            :tooltip => _('zoom in')},
+                           {:stock => Gtk::Stock::ZOOM_OUT,
+                            :method => proc{@layoutPreview.zoom_out},
+                            :tooltip => _('zoom out')},
+                           {:stock => Gtk::Stock::ZOOM_FIT,
+                            :method => proc{@layoutPreview.zoom_fit},
+                            :tooltip => _('zoom that all is displayed')}]
+            toolbarData.each_with_index do |buttonData, idx|
+                if buttonData.is_a? Hash
+                    button = Gtk::Button.new
+                    if idx == 1
+                        @saveButton = button
+                        button.sensitive = false
+                    elsif idx == 2
+                        @saveAsButton = button
+                        button.sensitive = false
+                    end
+                    button.tooltip_text = buttonData[:tooltip]
+                    button.signal_connect(:clicked) {buttonData[:method].call}
+                    img = Gtk::Image.new :stock => buttonData[:stock], :size => :large_toolbar
+                    button << img
+                    toolbar.pack_start button, :expand => false, :fill => false, :padding => 0
+                elsif buttonData.is_a? Symbol
+                    sep = Gtk::Separator.new :vertical
+                    toolbar.pack_start sep, :expand => false, :fill => false, :padding => 8
+                end
+            end
+            toolbar
+        end
 
-            button = Gtk::Button.new
-            button.signal_connect(:clicked) {@layoutPreview.zoom_in}
-            img = Gtk::Image.new :stock => Gtk::Stock::ZOOM_IN, :size => :small_toolbar
-            button << img
-            @toolbar.pack_start button, :expand => false, :fill => false, :padding => 0
-
-            button = Gtk::Button.new
-            button.signal_connect(:clicked) {@layoutPreview.zoom_out}
-            img = Gtk::Image.new :stock => Gtk::Stock::ZOOM_OUT, :size => :small_toolbar
-            button << img
-            @toolbar.pack_start button, :expand => false, :fill => false, :padding => 0
-
-            button = Gtk::Button.new
-            button.signal_connect(:clicked) {@layoutPreview.zoom_fit}
-            img = Gtk::Image.new :stock => Gtk::Stock::ZOOM_FIT, :size => :small_toolbar
-            button << img
-            @toolbar.pack_start button, :expand => false, :fill => false, :padding => 0
-            
-            sep = Gtk::Separator.new :vertical
-            @toolbar.pack_start sep, :expand => false, :fill => false, :padding => 8
-            
-            button = Gtk::Button.new
-            button.signal_connect(:clicked) {on_print}
-            img = Gtk::Image.new :stock => Gtk::Stock::PRINT, :size => :small_toolbar
-            button << img
-            @toolbar.pack_start button, :expand => false, :fill => false, :padding => 0
+
+        def on_open
+            p 'open file'
+        end
+
+
+        def on_save same
+            signal_emit :save_document, same
         end
 
 
@@ -148,7 +185,7 @@ module Etti
 
             ret = printOperation.run :print_dialog, self.toplevel
 
-=begin
+#=begin
             # only for debugging purpose
             printOperation.signal_connect('end-print') {print "-=== printing ended\n"}
 
@@ -187,7 +224,8 @@ module Etti
                 else
                   print "unknown result: ",printr.inspect,"\n"
             end
-=end
+#=end
         end
+=end
     end
 end

data/lib/etti/ui/label-layout.rb

@@ -2,6 +2,10 @@
 
 module Etti
     class LabelLayout < Gtk::EventBox
+        self.type_register
+        self.signal_new :element_count_changed, GLib::Signal::RUN_FIRST, nil, GLib::Type['void'], Integer
+        def signal_do_element_count_changed bla; end
+
         include GetText
         GetText.bindtextdomain 'etti', :path => Etti::LOCALE_PATH
 
@@ -68,6 +72,7 @@ module Etti
                 @elements << Etti::Element::Text.new(data, cx, cy)
             end
             queue_draw
+            signal_emit :element_count_changed, @elements.length
         end
 
 

data/lib/etti/ui/label-selection-page.rb

@@ -27,7 +27,7 @@ module Etti
             self.position = 300
         end
 
-        attr_reader :labelList, :pageData
+        attr_reader :labelList, :pageData, :pageDatas
 
         def create_label_list
             @labelListStore = Gtk::ListStore.new String
@@ -51,26 +51,24 @@ module Etti
         
         
         def on_label_list_cursor_changed
-                name = @labelListStore.get_iter(@labelList.cursor[0]).get_value 0        
-                if @previewArea.entryChanged and @pageData[:name] != name
-                    message = _("The page was changed. Should it be saved?")
-                    dialog = Etti::MessageDialog.new self.toplevel, :buttons => [:yes, :no, :cancel],
-                                 :type => :info, :message => message, :title => _('Page was changed')
-                    ret = dialog.run
-                    case ret
-                        when 'cancel'
-                            idx = @pageDatas.get_page_names.index @pageData[:name]
-                            @labelList.selection.select_path Gtk::TreePath.new(idx.to_s)
-                            return
-                        when 'yes'
-                            @previewArea.save
-                    end
+            name = @labelListStore.get_iter(@labelList.cursor[0]).get_value 0        
+            if @previewArea.entryChanged and @pageData[:name] != name
+                message = _("The page was changed. Should it be saved?")
+                dialog = Etti::MessageDialog.new self.toplevel, :buttons => [:yes, :no, :cancel],
+                             :type => :info, :message => message, :title => _('Page was changed')
+                ret = dialog.run
+                case ret
+                    when 'cancel'
+                        idx = @pageDatas.get_page_names.index @pageData[:name]
+                        @labelList.selection.select_path Gtk::TreePath.new(idx.to_s)
+                        return
+                    when 'yes'
+                        @previewArea.save
                 end
-            
-
-                @pageData = @pageDatas.get_page_data name
-                signal_emit :page_changed, @pageData
-                @previewArea.update_page_data @pageData
+            end
+            @pageData = @pageDatas.get_page_data name
+            signal_emit :page_changed, @pageData
+            @previewArea.update_page_data @pageData
         end
         
         

data/lib/etti/ui/page-layout.rb

@@ -65,6 +65,19 @@ module Etti
                                     :tooltip => _('The size of the sheet, i.e. "a4"')}
                                }
 
+            @sheetData = {:cols =>
+                            {:pos => 0,
+                             :label => _('columns'),
+                             :tooltip => _('The number of labels horizontal'),
+                             :range => 1..100},
+                          :rows =>
+                            {:pos => 1,
+                             :label => _('rows'),
+                             :tooltip => _('The number of labels vertical'),
+                             :range => 1..100}
+                         }
+
+
 
             @sizeGroup = Gtk::SizeGroup.new :both
             widget = make_entry :name, _('Name'), _("The name of the label\nIt has to be unique")
@@ -91,6 +104,11 @@ module Etti
                 box.pack_start Gtk::Label.new(val[:label]), :expand => false, :fill => false
 
                 entry = Rgw::RestrictedEntry.new
+                if key == :width or key == :height
+                    entry.editable = false
+                    entry.sensitive = false
+                end
+                
                 entry.restriction = :float
                 entry.range = val[:range]
                 @entries[key] = entry
@@ -101,17 +119,23 @@ module Etti
                 entry.width_chars = 8
 
                 entry.tooltip_text = val[:tooltip]
-                entry.editable = true
 
                 entry.signal_connect(:changed) {|entry| on_entry_changed entry}
             end
 
+            # the box below the sheet preview
+            bottomBox = Gtk::Box.new :horizontal
+            self.pack_start bottomBox, :expand => false, :fill => false
+            bottomLeft = Gtk::Box.new :vertical
+            bottomBox.pack_start bottomLeft, :expand => false, :fill => false
+            bottomRight = Gtk::Box.new :vertical
+            bottomBox.pack_start bottomRight, :expand => false, :fill => false, :padding => 64
             
             # create the page size combo box
             val = @descriptionData[:pageSize]
             cbox = Gtk::Box.new :horizontal
-            self.pack_start cbox, :expand => false, :fill => false
-            label = Gtk::Label.new.set_markup(_("<b>%s</b>: " % val[:label]))
+            bottomLeft.pack_start cbox, :expand => false, :fill => false
+            label = Gtk::Label.new.set_markup("<b>%s</b>: " % val[:label])
             label.xalign = 0.0
             cbox.pack_start label, :expand => false, :fill => false, :padding => 6
             @sizeGroup.add_widget label
@@ -128,8 +152,32 @@ module Etti
             [:manufacture, :orderNr, :description].each do |key|
                 val = @descriptionData[key]
                 widget = make_entry key, val[:label], val[:tooltip]
-                self.pack_start widget, :expand => false, :fill => false, :padding => 4
+                bottomLeft.pack_start widget, :expand => false, :fill => false, :padding => 4
             end
+            
+            # create the column and row count display
+            rcTable = Gtk::Table.new 3, 2, false
+            bottomRight.pack_start rcTable, :expand => false, :fill => false
+            @sheetData.each_pair do |key, val|
+                label = Gtk::Label.new.set_markup("<b>%s:  </b>" % val[:label])
+                label.xalign = 0.0
+                rcTable.attach_defaults label, 0, 1, val[:pos], val[:pos] + 1
+
+                entry = Rgw::RestrictedEntry.new
+                entry.restriction = :integer
+                entry.range = val[:range]
+                @entries[key] = entry
+                entry.name = key
+                rcTable.attach_defaults entry, 1, 2, val[:pos], val[:pos] + 1
+
+                entry.set_max_length 3
+                entry.width_chars = 8
+
+                entry.tooltip_text = val[:tooltip]
+
+                entry.signal_connect(:changed) {|entry| on_entry_changed entry}
+            end
+
             signal_connect(:map) {on_map}
             signal_connect(:draw) do |widget|
                 draw_bg
@@ -159,6 +207,10 @@ module Etti
                         w, h = *@pageData[key]
                         @entries[:width].text = @lcNumeric.to_s w
                         @entries[:height].text = @lcNumeric.to_s h
+                    when :cols
+                        @entries[:cols].text = @lcNumeric.to_s @pageData[key]
+                    when :rows
+                        @entries[:rows].text = @lcNumeric.to_s @pageData[key]
                     when :pageSize
                         @pageSizeCombo.active = @pageSizes.index @pageData[:pageSize]
                 end
@@ -195,6 +247,7 @@ private
         def on_entry_changed entry
             return if @pageData.nil?
             key = entry.name.to_sym
+            return if key == :width or key == :height
             text = @entries[key].text
             return if text.nil?
             @entryChanged = true
@@ -216,10 +269,25 @@ private
                     @pageData[:size][0] = val
                 when :height
                     @pageData[:size][1] = val
+                when :cols
+                    @pageData[:cols] = val
+                when :rows
+                    @pageData[:rows] = val
             end
+            recalculate_page_layout
         end
 
 
+        def recalculate_page_layout
+            pw, ph = *@pageDatas.get_page_dimensions(@pageData[:pageSize])
+            labelsWidth = (pw - @pageData[:borders][0] * 2 + @pageData[:padding][0] * 2) / @pageData[:cols]
+            labelsHeight = (pw - @pageData[:borders][1] * 2 + @pageData[:padding][1] * 2) / @pageData[:rows]
+            @entries[:width].text = @lcNumeric.to_s labelsWidth
+            @entries[:height].text = @lcNumeric.to_s labelsHeight
+        end
+
+
+
         def on_save
             @entries.each do |entry|
                 if entry[1].text.nil?
@@ -228,10 +296,10 @@ private
                                                       :type => :info, :message => message,
                                                       :title => _('Invalid Entries')
                     dialog.run
-                    return
+                    return nil
                 end
             end
-            @pageDatas.save_page_data(@pageData) do |type, answers, message|
+            return @pageDatas.save_page_data(@pageData, true) do |type, answers, message|
                 if answers == :yes_no
                     dialog = Etti::MessageDialog.new self.toplevel, :buttons => [:yes, :no],
                                  :type => :info, :message => message

data/lib/etti/ui/window.rb

@@ -1,6 +1,7 @@
 #encoding: UTF-8
 
 module Etti
+    DOCUMENT_SUFFIX = 'ettidoc'
     class Window < Gtk::Window
         include GetText
         GetText.bindtextdomain 'etti', :path => Etti::LOCALE_PATH
@@ -9,14 +10,20 @@ module Etti
             super()
             signal_connect(:delete_event) {on_quit false}
             signal_connect(:destroy) {on_quit true}
-            signal_connect_after(:draw) {paint_logo}
             self.border_width = 3
             self.title = 'Etti'
             set_default_size 1200, 900
             self.icon =  Etti::PIXMAP_PATH + 'win-logo.png'
-
             @logoPixbuf = Gdk::Pixbuf.new Etti::PIXMAP_PATH + 'logo.png'
 
+            # the current document, if is read from a file or already saved
+            @document = nil
+            @documentFileFilter = Gtk::FileFilter.new 
+            @documentFileFilter.add_pattern '*\.' + DOCUMENT_SUFFIX
+
+            @printPageSetup = nil
+            @saveButtonActivated = false
+
             @accelGroup = Gtk::AccelGroup.new
             add_accel_group @accelGroup
 
@@ -28,15 +35,24 @@ module Etti
             @labelSelectionPage.signal_connect(:page_changed) do |widget, pageData|
                 @labelLayoutPage.update_page_data pageData
             end
+            
+            @labelLayoutPage.layoutPreview.signal_connect(:element_count_changed) do |widget, count|
+                @saveButton.sensitive = (count > 0 and @saveButtonActivated)
+                @saveAsButton.sensitive = count > 0
+            end
+
             @labelLayoutPage.update_page_data @labelSelectionPage.pageData
 
+            pile = Rgw::Pile.new
+            self.add pile
             @notebook = Gtk::Notebook.new
-            add @notebook
+            pile.set_child @notebook
+            pile.set_pile_child create_toolbar, -24, 6
+
             notebook_append_page @dataPage, _("<b>  Data  \n  Input  </b>")
             notebook_append_page @labelSelectionPage, _("<b>  Label  \n  Selection  </b>")
             notebook_append_page @labelLayoutPage, _("<b>  Label  \n  Formatting  </b>")
             notebook_append_page @aboutPage, _("<b>  About Etti  </b>")
-            
         end
         attr_reader :dataPage, :labelLayoutPage, :labelSelectionPage
 
@@ -99,19 +115,184 @@ module Etti
         end
 
 
-        def on_quit destroy
-#            @project.save_project
-            Gtk.main_quit
+        def create_toolbar
+            vbox = Gtk::Box.new :vertical
+            toolbar = Gtk::Box.new :horizontal
+            
+            logo = Gtk::Image.new :pixbuf => @logoPixbuf #   Etti::PIXMAP_PATH + 'logo.png'
+            toolbar.pack_end logo, :expand => false, :fill => false, :padding => 32
+            
+            
+            vbox.pack_start toolbar, :expand => false, :fill => false, :padding => 6
+            toolbarData = [{:stock => Gtk::Stock::OPEN,
+                            :method => proc{on_open},
+                            :tooltip => _('open a new document')},
+                           {:stock => Gtk::Stock::SAVE,
+                            :method => proc{on_save true},
+                            :tooltip => _('save the document')},
+                           {:stock => Gtk::Stock::SAVE_AS,
+                            :method => proc{on_save false},
+                            :tooltip => _('save the document under a new name')},
+                           {:stock => Gtk::Stock::PRINT,
+                            :method => proc{on_print},
+                            :tooltip => _('print the labels')},
+                            :separator,
+                           {:stock => Gtk::Stock::ZOOM_IN,
+                            :method => proc{@labelLayoutPage.layoutPreview.zoom_in},
+                            :tooltip => _('zoom in')},
+                           {:stock => Gtk::Stock::ZOOM_OUT,
+                            :method => proc{@labelLayoutPage.layoutPreview.zoom_out},
+                            :tooltip => _('zoom out')},
+                           {:stock => Gtk::Stock::ZOOM_FIT,
+                            :method => proc{@labelLayoutPage.layoutPreview.zoom_fit},
+                            :tooltip => _('zoom that all is displayed')}]
+            toolbarData.each_with_index do |buttonData, idx|
+                if buttonData.is_a? Hash
+                    button = Gtk::Button.new
+                    if idx == 1
+                        @saveButton = button
+                        button.sensitive = false
+                    elsif idx == 2
+                        @saveAsButton = button
+                        button.sensitive = false
+                    end
+                    button.tooltip_text = buttonData[:tooltip]
+                    button.signal_connect(:clicked) {buttonData[:method].call}
+                    img = Gtk::Image.new :stock => buttonData[:stock], :size => :large_toolbar
+                    button << img
+                    toolbar.pack_start button, :expand => false, :fill => false, :padding => 0
+                elsif buttonData.is_a? Symbol
+                    sep = Gtk::Separator.new :vertical
+                    toolbar.pack_start sep, :expand => false, :fill => false, :padding => 8
+                end
+            end
+            vbox
         end
         
         
-        def paint_logo
-            return if self.window.nil?
-            cc = window.create_cairo_context
-            cc.set_source_pixbuf @logoPixbuf, allocation.width - 70, 12
-            cc.paint
-            false
+        def on_open
+        
+        end
+
+
+        def on_save same
+            path = @document
+            unless same
+                fileChooser = Gtk::FileChooserDialog.new :title => _('Select File'),
+                                                         :parent => self.toplevel,
+                                                         :action => :save,
+                                                         :buttons => [[:cancel, :cancel],
+                                                                      [:ok, :ok]]
+                                                        
+                fileChooser.filter = @documentFileFilter
+                ret = fileChooser.run
+                path = fileChooser.filename.clone
+                fileChooser.destroy
+                
+                return if ret == Gtk::ResponseType::CANCEL
+                return if path.nil?
+
+                path += '.' + DOCUMENT_SUFFIX unless path.end_with? '.' + DOCUMENT_SUFFIX
+                
+                if File.exist? path
+                    message = _("Shall the document\n\"%s\"\nbe replaced?") % File.basename(path)
+                    dialog = Etti::MessageDialog.new self.toplevel, :buttons => [:yes, :cancel],
+                                 :type => :info, :message => message
+                    ret = dialog.run
+                    return unless ret == 'yes'
+                end
+            end
+            
+            @document = path
+            activate_save true
+        
+            json = {'Etti' => 'document file', 'Version' => [1, 0]}
+            json['UserData'] = @dataPage.get_user_settings
+            json['PageData'] = @labelSelectionPage.pageDatas.save_page_data(@labelSelectionPage.pageData, false){}
+            json['LabelLayout'] = @labelLayoutPage.get_user_settings
             
+            fd = File.new path, File::CREAT|File::TRUNC|File::RDWR, 0644
+            fd.write JSON.pretty_generate(json)
+            fd.flush
+        end
+
+
+        def activate_save state
+            @saveButtonActivate = state
+            @saveButton.sensitive = (state and @labelLayoutPage.layoutPreview.elements.length() > 0)
+        end
+
+
+        def on_print
+            # set the borders from the selected label sheet
+            pd = @labelSelectionPage.pageData
+            lp = @labelLayoutPage.layoutPreview
+            pageSetup = Gtk::PageSetup.new
+            pageSetup.set_left_margin pd[:borders][0], :mm
+            pageSetup.set_top_margin pd[:borders][1], :mm
+            pageSetup.set_right_margin pd[:borders][0], :mm
+            pageSetup.set_bottom_margin pd[:borders][1], :mm
+            
+            
+            printOperation = Gtk::PrintOperation.new
+            printOperation.show_progress = true 
+            printOperation.default_page_setup = pageSetup
+            printOperation.n_pages = (lp.elementDataData.length().to_f /
+                                      (pd[:cols] * pd[:rows]).to_f).ceil
+            
+            printOperation.signal_connect('draw-page') do |widget, printContext, pageNumber|
+                cc = printContext.cairo_context
+                lp.print_labels cc, pageNumber
+            end
+
+            ret = printOperation.run :print_dialog, self.toplevel
+
+=begin
+            # only for debugging purpose
+            printOperation.signal_connect('end-print') {print "-=== printing ended\n"}
+
+            printOperation.signal_connect('status-changed') do
+                case printOperation.status
+                    when Gtk::PrintOperation::Status::INITIAL
+                        p 'initial'
+                    when Gtk::PrintOperation::Status::PREPARING
+                        p 'preparing'
+                    when Gtk::PrintOperation::Status::GENERATING_DATA
+                        p 'GENERATING_DATA'
+                    when Gtk::PrintOperation::Status::SENDING_DATA
+                        p 'SENDING_DATA'
+                    when Gtk::PrintOperation::Status::PENDING
+                        p 'PENDING'
+                    when Gtk::PrintOperation::Status::PRINTING
+                        p 'PRINTING'
+                    when Gtk::PrintOperation::Status::FINISHED
+                        p 'FINISHED'
+                    when Gtk::PrintOperation::Status::FINISHED_ABORTED
+                        p 'FINISHED_ABORTED'
+                    else
+                        'p unknown'
+                end
+            end
+
+            case ret
+                when Gtk::PrintOperation::Result::ERROR
+                  print "error\n"
+                when Gtk::PrintOperation::Result::CANCEL
+                  print "cancelled\n"
+                when Gtk::PrintOperation::Result::APPLY
+                  print "applied\n"
+                when Gtk::PrintOperation::Result::IN_PROGRESS
+                  print "in progress\n"
+                else
+                  print "unknown result: ",printr.inspect,"\n"
+            end
+=end
+        end
+
+
+        def on_quit destroy
+#            @project.save_project
+            Gtk.main_quit
         end
     end
 end

data/lib/etti/version.rb

@@ -1,3 +1,3 @@
 module Etti
-    VERSION = [0, 3, 1]
+    VERSION = [0, 5, 0]
 end

data/lib/etti.rb

@@ -14,6 +14,7 @@ require 'qrencoder'
 require 'filemagic'
 
 require 'rgw/big-list'
+require 'rgw/pile'
 require 'rgw/property-editor'
 require 'rgw/radio-revealer'
 require 'rgw/restricted-entry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etti
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Detlef Reichl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-toolbox
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - COPYING
 - README.md
 - bin/etti
+- lib/data/locale/de/LC_MESSAGES/etti.mo
 - lib/data/page-data.json
 - lib/data/pixmaps/logo.png
 - lib/data/pixmaps/logo.svg