← Back to branch summary

~ubuntu-branches/ubuntu/trusty/simple-scan/trusty

« back to all changes in this revision

Viewing changes to src/ui.vala

  • Committer: Matthew Fischer
  • Date: 2013-05-20 02:32:36 UTC
  • mfrom: (1.3.21)
  • Revision ID: matthew.fischer@canonical.com-20130520023236-vn5tflz51tidk8kk
https://launchpad.net/bugs/1181896
* New upstream release (LP: #1181896)
  - debian/patches/01-zlib.patch: Dropped, zlib now has a pkg-config file

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui.vala
51
51
    private Gtk.ComboBox photo_dpi_combo;
52
52
    private Gtk.ComboBox page_side_combo;
53
53
    private Gtk.ComboBox paper_size_combo;
 
54
    private Gtk.Scale brightness_scale;
 
55
    private Gtk.Scale contrast_scale;
54
56
    private Gtk.ListStore device_model;
55
57
    private Gtk.ListStore text_dpi_model;
56
58
    private Gtk.ListStore photo_dpi_model;
57
59
    private Gtk.ListStore page_side_model;
58
60
    private Gtk.ListStore paper_size_model;
 
61
    private Gtk.Adjustment brightness_adjustment;
 
62
    private Gtk.Adjustment contrast_adjustment;    
59
63
    private bool setting_devices;
60
64
    private bool user_selected_device;
61
65
 
70
74
    private Book book;
71
75
    private string? book_uri = null;
72
76
 
 
77
    private AutosaveManager? autosave_manager;
 
78
 
73
79
    private BookView book_view;
74
80
    private bool updating_page_menu;
75
81
    private int default_page_width;
99
105
        settings = new Settings ("org.gnome.SimpleScan");
100
106
 
101
107
        load ();
 
108
 
 
109
        autosave_manager = AutosaveManager.create (ref book);
102
110
    }
103
111
 
104
112
    ~UserInterface ()
610
618
        if (have_iter)
611
619
            paper_size_combo.set_active_iter (iter);
612
620
    }
 
621
    
 
622
    private void set_brightness (int brightness)
 
623
    {
 
624
        brightness_adjustment.set_value (brightness);
 
625
    }
 
626
 
 
627
    private void set_contrast (int contrast)
 
628
    {
 
629
        contrast_adjustment.set_value (contrast);
 
630
    }
613
631
 
614
632
    private int get_text_dpi ()
615
633
    {
658
676
        return false;
659
677
    }
660
678
 
 
679
    private int get_brightness ()
 
680
    {
 
681
        return (int) brightness_adjustment.get_value ();
 
682
    }
 
683
 
 
684
    private int get_contrast ()
 
685
    {
 
686
        return (int) contrast_adjustment.get_value ();
 
687
    }
 
688
 
661
689
    private ScanOptions get_scan_options ()
662
690
    {
663
691
        var options = new ScanOptions ();
674
702
            options.depth = 8;
675
703
        }
676
704
        get_paper_size (out options.paper_width, out options.paper_height);
 
705
        options.brightness = get_brightness ();
 
706
        options.contrast = get_contrast ();
677
707
 
678
708
        return options;
679
709
    }
1069
1099
        Gtk.show_about_dialog (window,
1070
1100
                               "title", title,
1071
1101
                               "program-name", "Simple Scan",
1072
 
                               "version", Config.VERSION,
 
1102
                               "version", VERSION,
1073
1103
                               "comments", description,
1074
1104
                               "logo-icon-name", "scanner",
1075
1105
                               "authors", authors,
1101
1131
        settings.set_enum ("page-side", get_page_side ());
1102
1132
        settings.set_int ("paper-width", paper_width);
1103
1133
        settings.set_int ("paper-height", paper_height);
 
1134
        settings.set_int ("brightness", get_brightness ());
 
1135
        settings.set_int ("contrast", get_contrast ());
1104
1136
        settings.set_int ("window-width", window_width);
1105
1137
        settings.set_int ("window-height", window_height);
1106
1138
        settings.set_boolean ("window-is-maximized", window_is_maximized);
1111
1143
 
1112
1144
        window.destroy ();
1113
1145
 
 
1146
        if (autosave_manager != null)
 
1147
            autosave_manager.cleanup ();
 
1148
 
1114
1149
        return true;
1115
1150
    }
1116
1151
 
1241
1276
 
1242
1277
    private void load ()
1243
1278
    {
1244
 
        Gtk.IconTheme.get_default ().append_search_path (Config.ICON_DIR);
 
1279
        Gtk.IconTheme.get_default ().append_search_path (ICON_DIR);
1245
1280
 
1246
1281
        Gtk.Window.set_default_icon_name ("scanner");
1247
1282
 
1248
1283
        builder = new Gtk.Builder ();
1249
 
        var filename = Path.build_filename (Config.UI_DIR, "simple-scan.ui", null);
 
1284
        var filename = Path.build_filename (UI_DIR, "simple-scan.ui", null);
1250
1285
        try
1251
1286
        {
1252
1287
            builder.add_from_file (filename);
1297
1332
        page_side_model = (Gtk.ListStore) page_side_combo.get_model ();
1298
1333
        paper_size_combo = (Gtk.ComboBox) builder.get_object ("paper_size_combo");
1299
1334
        paper_size_model = (Gtk.ListStore) paper_size_combo.get_model ();
 
1335
        brightness_scale = (Gtk.Scale) builder.get_object ("brightness_scale");
 
1336
        brightness_adjustment = (Gtk.Adjustment) brightness_scale.get_adjustment ();
 
1337
        contrast_scale = (Gtk.Scale) builder.get_object ("contrast_scale");
 
1338
        contrast_adjustment = (Gtk.Adjustment) contrast_scale.get_adjustment ();
1300
1339
 
1301
1340
        /* Add InfoBar (not supported in Glade) */
1302
1341
        info_bar = new Gtk.InfoBar ();
1363
1402
        var paper_height = settings.get_int ("paper-height");
1364
1403
        set_paper_size (paper_width, paper_height);
1365
1404
 
 
1405
        var lower = brightness_adjustment.get_lower ();
 
1406
        var darker_label = "<small>%s</small>".printf (_("Darker"));
 
1407
        var upper = brightness_adjustment.get_upper ();
 
1408
        var lighter_label = "<small>%s</small>".printf (_("Lighter"));
 
1409
        brightness_scale.add_mark (lower, Gtk.PositionType.BOTTOM, darker_label);
 
1410
        brightness_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
 
1411
        brightness_scale.add_mark (upper, Gtk.PositionType.BOTTOM, lighter_label);
 
1412
        set_brightness (settings.get_int ("brightness"));
 
1413
 
 
1414
        lower = contrast_adjustment.get_lower ();
 
1415
        var less_label = "<small>%s</small>".printf (_("Less"));
 
1416
        upper = contrast_adjustment.get_upper ();
 
1417
        var more_label = "<small>%s</small>".printf (_("More"));
 
1418
        contrast_scale.add_mark (lower, Gtk.PositionType.BOTTOM, less_label);
 
1419
        contrast_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
 
1420
        contrast_scale.add_mark (upper, Gtk.PositionType.BOTTOM, more_label);
 
1421
        set_contrast (settings.get_int ("contrast"));
 
1422
 
1366
1423
        var device = settings.get_string ("selected-device");
1367
1424
        if (device != null)
1368
1425
        {