mcc2 1.5.2 → 1.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/README.md +5 -3
- data/lib/mcc2/dataman/base.rb +0 -44
- data/lib/mcc2/dataman/csv.rb +0 -1
- data/lib/mcc2/dataman/database.rb +0 -2
- data/lib/mcc2/dataman/dbf.rb +0 -1
- data/lib/mcc2/dataman/none.rb +0 -2
- data/lib/mcc2/{cc_dialogbox.rb → fxselection_dialog.rb} +2 -2
- data/lib/mcc2/gui/layoutview_dlg.pp +1067 -1146
- data/lib/mcc2/layout.rb +0 -7
- data/lib/mcc2/layout_file.rb +1 -30
- data/lib/mcc2/layout_object/barcode.rb +0 -2
- data/lib/mcc2/layout_object/box.rb +0 -2
- data/lib/mcc2/layout_object/chip.rb +0 -3
- data/lib/mcc2/layout_object/embed.rb +0 -2
- data/lib/mcc2/layout_object/graphic.rb +0 -2
- data/lib/mcc2/layout_object/picture.rb +0 -2
- data/lib/mcc2/layout_object/text.rb +1 -3
- data/lib/mcc2/layoutview.rb +5 -3
- data/lib/mcc2/layoutview_dlg.rb +573 -607
- data/lib/mcc2/mcc2gui.rb +2 -8
- data/lib/mcc2/printer/card_printer.rb +0 -2
- data/lib/mcc2/printer/file_printer.rb +3 -3
- data/lib/mcc2/printer/gdi_card_printer.rb +0 -3
- data/lib/mcc2/printer/gdi_printer.rb +2 -3
- data/lib/mcc2/printer/linux_cups_printer.rb +2 -2
- data/lib/mcc2/printer/preview.rb +2 -9
- data/lib/mcc2/printer/printer_cab.rb +2 -2
- data/lib/mcc2/printer/printer_cx320_direct.rb +2 -2
- data/lib/mcc2/printer/printer_epl.rb +2 -3
- data/lib/mcc2/printer/printer_ttp34x.rb +2 -3
- data/lib/mcc2/printer/printer_zebra.rb +0 -1
- data/lib/mcc2/printer/svg_drawer.rb +111 -109
- data/lib/mcc2/version.rb +1 -1
- data/lib/mcc2.rb +242 -7
- data/locales/en.yml +5 -0
- data/locales/rs.yml +5 -0
- data/mcc2.gemspec +1 -0
- data.tar.gz.sig +0 -0
- metadata +16 -3
- metadata.gz.sig +0 -0
- data/lib/mcc2/constants.rb +0 -154
data/lib/mcc2/layout.rb
CHANGED
|
@@ -1,10 +1,3 @@
|
|
|
1
|
-
require "mcc2/cc_dialogbox"
|
|
2
|
-
require "mcc2/layout_file"
|
|
3
|
-
require "mcc2/layoutview"
|
|
4
|
-
require "mcc2/dataview"
|
|
5
|
-
require "mcc2/printerview"
|
|
6
|
-
require "mcc2/printer/preview"
|
|
7
|
-
|
|
8
1
|
module Mcc2
|
|
9
2
|
# definiert ein Clientfenster mit allen Einstellungen und Attributen, die für ein bestimmtes Kartenlayout benötigt werden
|
|
10
3
|
class Layout
|
data/lib/mcc2/layout_file.rb
CHANGED
|
@@ -1,35 +1,6 @@
|
|
|
1
1
|
require "nokogiri" # für die Layout-Datei
|
|
2
|
-
require "mcc2/constants"
|
|
3
|
-
require "mcc2/layout_object/go_attribut"
|
|
4
|
-
require "mcc2/layout_object/graphic" # die Basisklasse für die grafischen Objekte
|
|
5
|
-
require "mcc2/layout_object/barcode" # grafische Barcode-Objekte
|
|
6
|
-
require "mcc2/layout_object/picture" # grafische Bild-Objekte
|
|
7
|
-
require "mcc2/layout_object/text" # grafische Text-Objekte
|
|
8
|
-
require "mcc2/layout_object/box"
|
|
9
|
-
require "mcc2/layout_object/magstripe"
|
|
10
|
-
require "mcc2/layout_object/chip"
|
|
11
|
-
require "mcc2/layout_object/embed"
|
|
12
2
|
|
|
13
3
|
module Mcc2
|
|
14
|
-
module Printer
|
|
15
|
-
autoload :GdiPrinter, "mcc2/printer/gdi_printer"
|
|
16
|
-
autoload :FilePrinter, "mcc2/printer/file_printer"
|
|
17
|
-
autoload :LinuxCupsPrinter, "mcc2/printer/linux_cups_printer"
|
|
18
|
-
autoload :PrinterZebra, "mcc2/printer/printer_zebra"
|
|
19
|
-
autoload :PrinterCab, "mcc2/printer/printer_cab"
|
|
20
|
-
autoload :PrinterEpl, "mcc2/printer/printer_epl"
|
|
21
|
-
autoload :PrinterCx320Direct, "mcc2/printer/printer_cx320_direct"
|
|
22
|
-
autoload :PrinterCx320Gdi, "mcc2/printer/printer_cx320_gdi"
|
|
23
|
-
autoload :PrinterTTP34x, "mcc2/printer/printer_ttp34x"
|
|
24
|
-
end
|
|
25
|
-
|
|
26
|
-
module DataMan
|
|
27
|
-
autoload :Database, "mcc2/dataman/database"
|
|
28
|
-
autoload :CSV, "mcc2/dataman/csv"
|
|
29
|
-
autoload :DBF, "mcc2/dataman/dbf"
|
|
30
|
-
autoload :None, "mcc2/dataman/none"
|
|
31
|
-
end
|
|
32
|
-
|
|
33
4
|
class LayoutFile
|
|
34
5
|
class Error < RuntimeError
|
|
35
6
|
end
|
|
@@ -288,7 +259,7 @@ PRINT 1
|
|
|
288
259
|
EOT
|
|
289
260
|
|
|
290
261
|
converter = Class.new(Printer::Base) do
|
|
291
|
-
include SvgDrawer
|
|
262
|
+
include Printer::SvgDrawer
|
|
292
263
|
|
|
293
264
|
def pango_font_of(go)
|
|
294
265
|
font = go[GOA_FONT_TYP]
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
require "mcc2/layout_object/graphic"
|
|
2
|
-
|
|
3
1
|
module Mcc2
|
|
4
2
|
module LayoutObject
|
|
5
3
|
class Text < Graphic
|
|
@@ -17,13 +15,13 @@ module Mcc2
|
|
|
17
15
|
add_attr(@go_attributes, GOA_BACK_COLOR, String, "FFFFFFFF")
|
|
18
16
|
add_attr(@go_attributes, GOA_JUSTIFICATION, String, S_JUST_LEFT)
|
|
19
17
|
add_attr(@go_attributes, GOA_JUSTIFICATION_BLOCK, String, "false")
|
|
18
|
+
add_attr(@go_attributes, GOA_LINE_SPACING, String, "1.0")
|
|
20
19
|
end
|
|
21
20
|
end
|
|
22
21
|
end
|
|
23
22
|
end
|
|
24
23
|
|
|
25
24
|
if __FILE__ == $PROGRAM_NAME
|
|
26
|
-
require "./../constants"
|
|
27
25
|
to = Mcc2::LayoutObject::Text.new
|
|
28
26
|
to.go_attributes.each { |e| p e }
|
|
29
27
|
end
|
data/lib/mcc2/layoutview.rb
CHANGED
|
@@ -127,6 +127,7 @@ module Mcc2
|
|
|
127
127
|
@layout.connect_filebutton_to_textfield(@lf.button_fontfile_select, @lf.textfield_font_file,
|
|
128
128
|
filepatterns: ["Truetype/Opentype font (*.ttf,*.otf)", "PS-type1 font (*.pfb)", "All Files (*)"])
|
|
129
129
|
@lf.textfield_fontsize.connect(@text_field_trigger) { |sender, sel, event| textfield_exit(sender, GOA_FONT_HEIGHT) }
|
|
130
|
+
@lf.textfield_line_spacing.connect(@text_field_trigger) { |sender, sel, event| textfield_exit(sender, GOA_LINE_SPACING) }
|
|
130
131
|
|
|
131
132
|
# der Checkbuttons für die Einstellung, ob Magnestreifen, Kontaktchip und Kontaktlos personalisiert werden sollen
|
|
132
133
|
@lf.checkbutton_contactless.connect(SEL_COMMAND) { |sender, sel, event| change_chkbtn(sender, S_CONTACTLESS) }
|
|
@@ -635,14 +636,14 @@ module Mcc2
|
|
|
635
636
|
# den gewählten Parameter in den entsprechenden Listen markieren
|
|
636
637
|
bc_typ = obj[GOA_BARCODE_TYP]
|
|
637
638
|
bc_id = @barcodes.index(bc_typ.to_sym)
|
|
638
|
-
|
|
639
|
+
FXSelectionDialog.new(@parent.app, I18n.t(:barcode_is_not_avaliable, default: "Der Barcode-Typ %{bc_typ} existiert nicht in der Liste der verfügbaren Barcodes. Der Wert wird auf 'NONE' gesetzt.", bc_typ: ), [I18n.t(:ok_button, default: "&OK")]) unless bc_id
|
|
639
640
|
@lf.listbox_barcode_typ.currentItem = bc_id if bc_id
|
|
640
641
|
end
|
|
641
642
|
|
|
642
643
|
# füllt die Font-Auswahlliste mit den möglichen Fonts
|
|
643
644
|
def fill_font_list
|
|
644
645
|
# Font-Name
|
|
645
|
-
rmfl = SvgDrawer.builtin_font_names.keys
|
|
646
|
+
rmfl = Printer::SvgDrawer.builtin_font_names.keys
|
|
646
647
|
rmfl.sort!
|
|
647
648
|
@lf.listbox_fonts.clearItems
|
|
648
649
|
@lf.listbox_fonts.appendItem(I18n.t(:font_selection_please_select_entry, default: "Bitte auswählen"))
|
|
@@ -659,6 +660,7 @@ module Mcc2
|
|
|
659
660
|
def fill_font_fields(obj)
|
|
660
661
|
# die Schriftgröße zurücklesen
|
|
661
662
|
@lf.textfield_fontsize.text = obj[GOA_FONT_HEIGHT]
|
|
663
|
+
@lf.textfield_line_spacing.text = obj[GOA_LINE_SPACING]
|
|
662
664
|
|
|
663
665
|
font_typ = obj[GOA_FONT_TYP]
|
|
664
666
|
# den gewählten Parameter in den entsprechenden Listen markieren
|
|
@@ -749,7 +751,7 @@ module Mcc2
|
|
|
749
751
|
end
|
|
750
752
|
nn = names.join(", ")
|
|
751
753
|
s = I18n.t(:delete_object_confirmation, default: "Wollen Sie wirklich %{count} %{nameslist} löschen?\nDieser Vorgang lässt sich nicht rückgängig machen!", count: names.size, nameslist: nn)
|
|
752
|
-
error_WahlMessage =
|
|
754
|
+
error_WahlMessage = FXSelectionDialog.new(@parent.app, s, [I18n.t(:delete_button, default: "&Löschen"), I18n.t(:cancel_button, default: "&Abbrechen")])
|
|
753
755
|
error_WahlMessage.execute
|
|
754
756
|
if error_WahlMessage.selection == 0
|
|
755
757
|
@layout_file.delete_objects(@selected_object_ids)
|