etti 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d2ab51124b22c47e91b53f203896608f6864ba
-  data.tar.gz: 751753191c55665d7765dd7e16b84a701ce172d0
+  metadata.gz: 89d498ee2a421b67fe7a12feb07ddd52235b6c84
+  data.tar.gz: 3c9bfb33e739f40f16d06b4d8361a9cab4f9fb98
 SHA512:
-  metadata.gz: daf955706b9dac4c9ddd464c4732a848853b807bd56ed6016e835748c392827ca61b51f3cfc4e979d51aa378cbbd1e57fbb290f38bfc7984ccda574f0e11cace
-  data.tar.gz: 6ad7f544fd18741f19094ff9410bba699002f475697ebbcf7945abb321035dc90ec905ffed8f8bd19c3db60e663a48db1cf8cf308cf34e44c5da372f7a7ccc52
+  metadata.gz: 85f9d0437799b067274fbde95db136cde8f585184163ea812e996484696f7750cea97e26fa23d214cf5fcf6836db856253719424f49c8d759d6cd584d4c5f043
+  data.tar.gz: 9794973cc6429b7265120b67a7b2e750e94fab7a62d19411cd1b6e7f2046eddc827ebda7acf204e06b6b2affcd8c277c9245d997ab25c2c3a48645c17bad8528

data/lib/etti/elements/data.rb

@@ -3,10 +3,14 @@
 module Etti
     module Element
         class Data < Etti::Element::Text
+            include GetText
+            GetText.bindtextdomain 'etti', :path => Etti::LOCALE_PATH
+
             SHOW_AS_TEXT = 0
             SHOW_AS_QR = 1
             QR_ERROR_LEVELS = [:low, :medium, :quarter, :high]
             QR_ENCODING = [:numeric, :alphanumeric, :ascii, :kanji]
+            QR_KEYS = ['dataGroup', 'qrWidth', 'qrHeight', 'qrVersion', 'qrErrorCorrection', 'qrEncoding']
             def initialize dataGroup, text, x=nil, y=nil, size=nil
                 super text, x, y, size
                 @dataGroup = dataGroup
@@ -26,7 +30,11 @@ module Etti
                 elsif name ==   'qrVersion'                 then @qrVersion = val.to_i;                             return;
                 elsif name ==   'qrErrorCorrection'         then @qrErrorCorrection = QR_ERROR_LEVELS[val.to_i];    return;
                 elsif name ==   'qrEncoding'                then @qrEncoding = QR_ENCODING[val.to_i];               return;
-                elsif name ==   'showAs'                    then @showAs = val;                                     return; end
+                elsif name ==   'dataGroup'                 then @dataGroup = val;                                  return;
+                elsif name ==   'showAs'
+                    @showAs = (val == SHOW_AS_TEXT or val == 'text') ? SHOW_AS_TEXT : SHOW_AS_QR
+                    return;
+                end
                 super name, val
             end
 
@@ -37,22 +45,56 @@ module Etti
                 elsif name ==   'qrVersion'                 then return @qrVersion;
                 elsif name ==   'qrErrorCorrection'         then return QR_ERROR_LEVELS.index @qrErrorCorrection;
                 elsif name ==   'qrEncoding'                then return QR_ENCODING.index @qrEncoding;
-                elsif name ==   'showAs'                    then return @showAs; end
+                elsif name ==   'showAs'                    then return @showAs;
+                elsif name ==   'dataGroup'                 then return @dataGroup; end
                 super name
             end
 
 
             def to_h
-                hs = {}
+                hs = super()
+                hs['elementType'] = 'data'
                 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
+                    QR_KEYS.each {|name| hs[name] = get_by_name name}
+                end
+                hs
+            end
+
+
+            def validate_from_h hs
+                sections = Etti::PropertyEditorData::DATA_PROPS.select{|a| a.key? :revealSections}.first[:revealSections]
+                
+                if hs['showAs'] == 'text'
+                    return super(hs)
+                elsif hs['showAs'] == 'qr'
+                    data = sections.select{|a| a[:section] == 'QR-Code'}.first[:data]
+                    # sort out all keys which are no in qrKeys and give them to the parent class
+                    keys = hs.keys - QR_KEYS
+                    diff = hs.select {|k, v| keys.include? k}
+                    ret = super diff
+                    return ret if ret
+                    
+                    # check the value of the remaining keys
+                    QR_KEYS.each do |name|
+                        next if hs[name].nil?
+                        if name == 'dataGroup'
+                            return _('ElementData invalid type or size for dataGroup') unless hs[name].is_a? String and hs[name].length() > 0
+                            next
+                        end
+                        entry = data.select {|dat| dat[:id0] == name or dat[:id1] == name}
+                        if entry[0][:range]
+                            return _("ElementData %s is out of range") % name unless entry[0][:range].cover? hs[name]
+                        elsif entry[0][:entries]
+                            return _("ElementData %s is out of range") % name if hs[name] < 0 or hs[name] >= entry[0][:entries].length
+                        end
                     end
+                else
+                    return _('ElementData invalid data type')
                 end
-                hs.merge super()
+                nil
             end
 
 

data/lib/etti/elements/text.rb

@@ -3,6 +3,11 @@
 module Etti
     module Element
         class Text < Etti::Element::Base
+            include GetText
+            GetText.bindtextdomain 'etti', :path => Etti::LOCALE_PATH
+
+            TEXT_KEYS = ['text', 'pos_x', 'pos_y', 'size', 'rotation', 'color']
+            GROUP_KEYS = ['elementType', 'dataGroup', 'showAs']
             def initialize text, x=nil, y=nil, size=nil
                 super x, y
                 @text = text || ''
@@ -27,16 +32,46 @@ module Etti
                 elsif name == 'size'            then return @size;
                 elsif name == 'rotation'        then return @rotation;
                 elsif name == 'color'           then return @color;     end
+                nil
             end
 
 
             def to_h
+#                hs = super() # use this if we take data from Element::Base
                 hs = {}
-                ['text', 'pos_x', 'pos_y', 'size', 'rotation', 'color'].each do |name|
-                    hs[name] = get_by_name name
-                end
+                hs['elementType'] = 'text'
+                TEXT_KEYS.each {|name| hs[name] = get_by_name name}
                 hs
-#                hs.merge super
+            end
+
+
+            def validate_from_h hs
+                data = Etti::PropertyEditorData::TEXTS_PROPS
+                # stop if hs has a key that is not in TEXT_KEYS
+                return _('ElementText invalid property keys') if (hs.keys - GROUP_KEYS - TEXT_KEYS).length() > 0
+                # check the value of the keys
+                TEXT_KEYS.each do |name|
+                    next if hs[name].nil?
+                    entry = data.select {|dat| dat[:id0] == name or dat[:id1] == name}
+                    if entry[0][:range]
+                        return _("ElementText %s is out of range") % name unless entry[0][:range].cover? hs[name]
+                    elsif name == 'text'
+                        # we limit the text length to 10_000 chars; for a label thats more than enough
+                        return _("ElementText %s length is out of range") % name if hs[name].length() < 1 or hs[name].length > 10_000
+                    elsif name == 'color'
+                        col = hs[name]
+                        return _('ElementText color is invalid') if !col.is_a? Array or col.length() != 4
+                        col.each do |val| 
+                            return _('ElementText invalid value in color') if val < 0.0 or val > 1.0
+                        end
+                    end
+                end
+                nil
+            end
+
+
+            def from_h hs
+                hs.each_pair {|k, v| set_by_name k, v}
             end
 
 

data/lib/etti/page-datas.rb

@@ -36,7 +36,7 @@ module Etti
                 end
             end
         end
-            attr_reader :pageDatas        
+        attr_reader :pageDatas, :pageDimensions
 
 
         def get_page_names
@@ -60,6 +60,26 @@ module Etti
         end
         
         
+        def set_page_data type, data
+            newPage = !@pageDatas.key?(type)
+            if newPage
+                pageHash = {}
+            else
+                pageHash = @pageDatas[type]
+            end
+            FIELDS.each do |key|
+                d = data[key]
+                if d.is_a? Array or d.is_a? String
+                    pageHash[key.to_sym] = d.clone
+                else
+                    pageHash[key.to_sym] = data[key]
+                end
+            end
+            pageHash[:name] = type
+            signal_emit(:new_page, [type, pageHash]) if newPage
+        end
+        
+        
         def get_page_dimensions size
             @pageDimensions[size]
         end
@@ -104,6 +124,10 @@ module Etti
                 signal_emit :new_page, [page[:name], pageHash] 
             end
             
+            unless savePage
+                pageHash['name']  = page[:name]
+            end
+            
             return pageHash unless savePage
             fd = File.new @dataFiles.last, File::CREAT|File::TRUNC|File::RDWR, 0644
             fileData = $etti_developement_version ? JSON.pretty_generate(json) : JSON.fast_generate(json)

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

@@ -43,16 +43,47 @@ module Etti
                 settings['string'] = @dataEntries[1].text
                 settings['postfix'] = @dataEntries[2].text
             elsif section == 1
-            
-            
+                settings['section'] = 'file'
+                settings['fileName'] = @fileButton.filename
+                settings['separator'] = @previewList.separator
+                settings['hasHead'] = @hasHeadCheckButton.active? ? 1 : 0
             end
             settings
         end
 
 
-        def set_user_settings
-        
-        
+        def validate_user_settings settings
+            if settings['section'] == 'enumeration'
+                return _('DataPage prefix is not a String.') unless settings['prefix'].is_a? String
+                return _('DataPage data string is not a String.') unless settings['string'].is_a? String
+                return _('DataPage postfix is not a String.') unless settings['postfix'].is_a? String
+            elsif settings['selection'] == 'file'
+                fn = settings['file']
+                return _('DataPage filename is not a String.') unless fn.is_a? String
+                return _("DataPage file doesn'exist, or is not readable.") unless File.exist? fn and File.readable? fn
+                sep = settings['separator']
+                return _('DataPage separator is not a String') unless sep.is_a? String and @separatorStrings.include? sep
+                hs = settings['hasHead']
+                return _('DataPage has head setting is invalid (not 0 or 1)') unless hs.is_a? Integer and (hs == 0 or hs == 1)
+            else
+                return _('DataPage section is invalid')
+            end
+            nil
+        end
+
+
+        def set_user_settings settings
+            if settings['section'] == 'enumeration'
+                @radioRevealer.active = 0
+                @dataEntries[0].text = settings['prefix']
+                @dataEntries[1].text = settings['string']
+                @dataEntries[2].text = settings['postfix']
+            else
+                @radioRevealer.active = 0
+                @fileButton.filename = settings['fileName']
+                @fileSeparatorCombo.active = @separatorStrings.index settings['separator']
+                @hasHeadCheckButton.active = settings['hasHead'] == 1
+            end
         end
 
 

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

@@ -19,13 +19,8 @@ module Etti
 
             @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
-
             paned.pack2 ebox, :resize => false, :shrink => false
 
             label = Gtk::Label.new _(' Drag the elements over ')
@@ -37,6 +32,7 @@ module Etti
         end
         attr_reader :layoutPreview
 
+
         def get_user_settings
             settings = {}
             settings['scale'] = @layoutPreview.scale
@@ -45,19 +41,52 @@ module Etti
             elementData = []
             @layoutPreview.elements.each {|element| elementData << element.to_h}
             settings['elements'] = elementData
-        end
-        
-        def set_user_settings
-        
+            settings
         end
 
 
-=begin
-        def activate_save state
-            @saveButtonActivate = state
-            @saveButton.sensitive = (state and @layoutPreview.elements.length() > 0)
+        def validate_user_settings settings
+            return _('LabelLayout scale is not a Numeric') unless settings['scale'].is_a? Numeric
+            return _('LabelLayout scale is out of range') if settings['scale'] < Etti::LabelLayout::SCALE_MIN or
+                            settings['scale'] > Etti::LabelLayout::SCALE_MAX
+            return _('LabelLayout centerX is not a Numeric') unless settings['centerX'].is_a? Numeric
+            return _('LabelLayout centerY is not a Numeric') unless settings['centerY'].is_a? Numeric
+            return _('LabelLayout elements is not an Array') unless settings['elements'].is_a? Array
+            settings['elements'].each do |element|
+                el = nil
+                if element['elementType'] == 'text'
+                    el = Etti::Element::Text.new 'vali'
+                elsif element['elementType'] == 'data'
+                    el = Etti::Element::Data.new :dg, 'vali'
+                else
+                    return _("LabelLayout element type %s is unknown") % element['elementType'].to_s
+                end
+                ret = el.validate_from_h element
+                return ret if ret
+            end
+            nil
         end
-=end
+
+        
+        def set_user_settings settings
+            @layoutPreview.scale = settings['scale']
+            @layoutPreview.centerX = settings['centerX']
+            @layoutPreview.centerY = settings['centerY']
+
+            @layoutPreview.elements.clear
+
+            settings['elements'].each do |element|
+                el = nil
+                if element['elementType'] == 'text'
+                    el = Etti::Element::Text.new element['text']
+                elsif element['elementType'] == 'data'
+                    el = Etti::Element::Data.new element['dataGroup'], element['text']
+                end
+                el.from_h element
+                @layoutPreview.elements << el
+            end
+        end
+
 
         def update_page_data pageData
             @pageData = pageData
@@ -103,129 +132,5 @@ module Etti
                 end
             end
         end
-
-=begin
-        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
-
-
-        def on_open
-            p 'open file'
-        end
-
-
-        def on_save same
-            signal_emit :save_document, same
-        end
-
-
-        def on_print
-            # set the borders from the selected label sheet
-            pageSetup = Gtk::PageSetup.new
-            pageSetup.set_left_margin @pageData[:borders][0], :mm
-            pageSetup.set_top_margin @pageData[:borders][1], :mm
-            pageSetup.set_right_margin @pageData[:borders][0], :mm
-            pageSetup.set_bottom_margin @pageData[:borders][1], :mm
-            
-            
-            printOperation = Gtk::PrintOperation.new
-            printOperation.show_progress = true 
-            printOperation.default_page_setup = pageSetup
-            printOperation.n_pages = (@layoutPreview.elementDataData.length().to_f /
-                                      (@pageData[:cols] * @pageData[:rows]).to_f).ceil
-            
-            printOperation.signal_connect('draw-page') do |widget, printContext, pageNumber|
-                cc = printContext.cairo_context
-                @layoutPreview.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
-=end
     end
 end

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

@@ -57,7 +57,8 @@ module Etti
             @width = nil
             @height = nil
         end
-        attr_reader :backBuffer, :scale, :centerX, :centerY, :elements, :elementDataData
+        attr_reader :backBuffer, :elementDataData
+        attr_accessor :scale, :centerX, :centerY, :elements
 
 
         def on_drag_drop context, x, y
@@ -194,7 +195,7 @@ module Etti
             h = @pageData[:size][1] * 2.8346457
             
             sl = (@pageData[:cols] * @pageData[:rows]) * page
-            el = elementDataData.length
+            el = @elementDataData.length
             labels = el - sl            
             
             idc = []
@@ -277,13 +278,15 @@ module Etti
             minY = 2**31
             maxY = - 2**31
 
-            @elements.each do |element|
-                ext = element.get_extent self
-                # TODO use min max methodes
-                minX = ext.x if ext.x < minX
-                minY = ext.y if ext.y < minY
-                maxX = ext.x + ext.width if ext.x + ext.width > maxX
-                maxY = ext.y + ext.height if ext.y + ext.height > maxY
+            if @backBuffer
+                @elements.each do |element|
+                    ext = element.get_extent self
+                    # TODO use min max methodes
+                    minX = ext.x if ext.x < minX
+                    minY = ext.y if ext.y < minY
+                    maxX = ext.x + ext.width if ext.x + ext.width > maxX
+                    maxY = ext.y + ext.height if ext.y + ext.height > maxY
+                end
             end
             
             # get the label in

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

@@ -29,6 +29,58 @@ module Etti
 
         attr_reader :labelList, :pageData, :pageDatas
 
+
+        def get_user_settings
+            @pageDatas.save_page_data(@pageData, false){}
+        end
+
+
+        def validate_user_settings settings
+            settings.keys.each do |key|
+                unless Etti::PageDatas::FIELDS.include? key.to_sym
+                    next if key == 'source' or key == 'name'
+                    return _("PageData has invalid property key %s") % key.to_s
+                    
+                end
+            end
+            [:manufacture, :orderNr, :description, :name].each do |label|
+                val = settings[label.to_s]            
+                next if val.nil?
+                return _("PageData %s is invalid") % label unless val.is_a? String
+                return _('PageData name is invalid') if label == :name and val.length() < 1
+            end
+            [:cols, :rows].each do |label|
+                val = settings[label.to_s]            
+                next if val.nil?
+                return _("PageData %s is invalid") % label unless val.is_a? Numeric and val > 0.0
+            end
+            [:size, :borders, :padding].each do |label|
+                val = settings[label.to_s]            
+                next if val.nil?
+                return _("PageData %s is invalid") % label unless val.is_a? Array and val.length() == 2
+                return _("PageData %s is invalid") % label unless val[0].is_a? Numeric and val[1].is_a? Numeric and val[0] >= 0 and val[1] >= 0
+            end
+            return _('PageData pageSize is invalid') unless @pageDatas.pageDimensions.include? settings['pageSize']
+            nil
+        end
+
+
+        def set_user_settings settings
+            name = settings['name']
+            @pageDatas.set_page_data name, settings
+            pt = nil
+            @labelListStore.each do |model, path, iter|
+                if iter[0] == name
+                    @labelList.selection.select_path path
+                    # We have to call the update manualy, because sometimes the :cursor_changed signal
+                    # not emited. 
+                    on_label_list_cursor_changed
+                    return
+                end
+            end
+        end
+
+
         def create_label_list
             @labelListStore = Gtk::ListStore.new String
             @labelList = Gtk::TreeView.new @labelListStore
@@ -51,7 +103,7 @@ module Etti
         
         
         def on_label_list_cursor_changed
-            name = @labelListStore.get_iter(@labelList.cursor[0]).get_value 0        
+            name = @labelListStore.get_value @labelList.selection.selected, 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],

data/lib/etti/ui/message-dialog.rb

@@ -26,7 +26,7 @@ module Etti
             if flags[:buttons]
                 @buttonBox = Gtk::Box.new :horizontal
                 @buttonBox.homogeneous = true
-                @vbox.pack_start @buttonBox, :expand => false, :fill => false
+                @vbox.pack_end @buttonBox, :expand => false, :fill => false
                 
                 flags[:buttons].each do |btn|
                     stock = case btn
@@ -77,6 +77,13 @@ module Etti
                 @hbox.pack_start label, :expand => true, :fill => true, :padding => 12
             end
             
+            
+            if flags[:additional]
+                label = Gtk::Label.new flags[:additional]
+                @vbox.pack_start label, :expand => true, :fill => true, :padding => 12
+            end
+
+            
             if flags[:remind]
                 
             end

data/lib/etti/ui/property-editor-data.rb

@@ -29,7 +29,10 @@ module Etti
 
             {label: _('rotation'), type: :spin,   useDefault: true,
               id0: 'rotation', range: 0.0..360.0, step: 1.0,
-              default0: DEFAULT_TEXTS_ROTATION}
+              default0: DEFAULT_TEXTS_ROTATION},
+            
+            {label: _('color'), type: :color, useDefault: true,
+              id0: 'color', default0: DEFAUTL_TEXTS_COLOR},
          ]
 
 

data/lib/etti/ui/window.rb

@@ -171,14 +171,78 @@ module Etti
         
         
         def on_open
-        
+            fileChooser = Gtk::FileChooserDialog.new :title => _('Open File'),
+                                                     :parent => self.toplevel,
+                                                     :action => :open,
+                                                     :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?
+            
+            @document = path
+            activate_save true
+
+            data = File.new(path).read
+            
+            begin            
+                json = JSON.parse data
+            rescue JSON::ParserError => additional
+                message = _("The document contains errors\nMessage from the file reader:")
+                
+                dialog = Etti::MessageDialog.new self.toplevel, :buttons => [:close],
+                                                  :type => :info, :message => message,
+                                                  :title => _('Invalid Entries'),
+                                                  :additional => additional.to_s
+                dialog.run
+                return
+            end 
+            
+            
+            unless json['Etti'] == 'document file'
+                message = _("The document file\n\"%s\"\nis not a valid etti document") % path
+                dialog = Etti::MessageDialog.new self.toplevel, :buttons => [:close],
+                                                  :type => :info, :message => message,
+                                                  :title => _('Invalid Entries')
+                dialog.run
+                return
+            end
+
+            # restore all settings
+            sdat = [[@dataPage,           json['UserData']],
+                    [@labelLayoutPage,    json['LabelLayout']],
+                    [@labelSelectionPage, json['PageData']]]
+            return if validate_settings sdat
+            sdat.each {|section| section[0].send :set_user_settings, section[1]}
+        end
+
+
+        def validate_settings data
+            data.each do |section|
+                ret = section[0].send :validate_user_settings, section[1]
+                if ret
+                    message = _('The file could not be loaded.')
+                    dialog = Etti::MessageDialog.new self.toplevel, :buttons => [:close],
+                                                      :type => :error, :message => message,
+                                                      :title => _('File load error'),
+                                                      :additional => ret
+                    dialog.run
+                    return true
+                end
+            end
+            false
         end
 
 
         def on_save same
             path = @document
             unless same
-                fileChooser = Gtk::FileChooserDialog.new :title => _('Select File'),
+                fileChooser = Gtk::FileChooserDialog.new :title => _('Save File'),
                                                          :parent => self.toplevel,
                                                          :action => :save,
                                                          :buttons => [[:cancel, :cancel],
@@ -208,11 +272,11 @@ module Etti
         
             json = {'Etti' => 'document file', 'Version' => [1, 0]}
             json['UserData'] = @dataPage.get_user_settings
-            json['PageData'] = @labelSelectionPage.pageDatas.save_page_data(@labelSelectionPage.pageData, false){}
+            json['PageData'] = @labelSelectionPage.get_user_settings
             json['LabelLayout'] = @labelLayoutPage.get_user_settings
             
             fd = File.new path, File::CREAT|File::TRUNC|File::RDWR, 0644
-            fd.write JSON.pretty_generate(json)
+            fd.write JSON.pretty_generate(json, :indent => '    ')
             fd.flush
         end
 

data/lib/etti/version.rb

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

data/lib/etti.rb

@@ -19,7 +19,6 @@ require 'rgw/property-editor'
 require 'rgw/radio-revealer'
 require 'rgw/restricted-entry'
 
-#require 'etti/config'
 require 'etti/colors'
 require 'etti/dnd-data'
 require 'etti/page-datas'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etti
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Detlef Reichl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-toolbox