← Back to branch summary

~ubuntu-branches/ubuntu/trusty/bluefish/trusty

« back to all changes in this revision

Viewing changes to src/file_dialogs.c

  • Committer: Package Import Robot
  • Author(s): Daniel Leidert
  • Date: 2012-06-27 22:28:39 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20120627222839-5g0f5s6gpaezfhve
Tags: 2.2.3-1
* New upstream release.
* debian/control: Dropped DM-Upload-Allowed.
  (Maintainer): Set to my new address.
  (Suggests): Calculate browsers depending on distribution.
  (Depends): Added python depends for newly shipped Python scripts.
* debian/copyright: Minor update. Link to GPLv2 text.
* debian/rules: Enabled hardening. Added python2 module. Calculate brwoser
  dependencies via dpkg-vendor.
* debian/patches/LP810663_blacklist_from_appmenu.patch: Adjusted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/file_dialogs.c
179
179
        }
180
180
        tfs->find_pattern = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(lstore), 0);
181
181
        g_object_unref(lstore);*/
182
 
        tfs->find_pattern = combobox_with_popdown(NULL, bfwin->session->filegloblist, TRUE);
 
182
        tfs->find_pattern = combobox_with_popdown("", bfwin->session->filegloblist, TRUE);
183
183
        dialog_mnemonic_label_in_table(_("_Pattern:"), tfs->find_pattern, table, 0, 1, 1, 2);
184
184
        gtk_table_attach_defaults(GTK_TABLE(table), tfs->find_pattern, 1, 5, 1, 2);
185
185
        g_signal_connect(G_OBJECT(tfs->find_pattern), "changed",
369
369
void
370
370
file_open_url_cb(GtkAction * action, Tbfwin * bfwin)
371
371
{
372
 
        GtkWidget *vbox, *hbox, *but;
 
372
        GtkWidget *align, *vbox, *hbox, *but;
373
373
        Tou *ou;
374
374
        GList *urlhistory = NULL, *tmplist = NULL;
375
375
        ou = g_new(Tou, 1);
393
393
                gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 4);
394
394
        }
395
395
#endif
396
 
        gtk_box_pack_start(GTK_BOX(vbox), bf_label_with_markup(_("<b>Open URL</b>")), FALSE, FALSE, 5);
 
396
/*      gtk_box_pack_start(GTK_BOX(vbox), bf_label_with_markup(_("<b>Open URL</b>")), FALSE, FALSE, 5);*/
397
397
        gtk_container_add(GTK_CONTAINER(ou->win), vbox);
398
398
        tmplist = g_list_first(bfwin->session->recent_files);
399
399
        while (tmplist) {
405
405
        ou->entry = boxed_combobox_with_popdown("", urlhistory, TRUE, vbox);
406
406
        free_stringlist(urlhistory);
407
407
/*  ou->entry = boxed_entry_with_text("", 255, vbox); */
408
 
        gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 5);
409
 
 
 
408
 
 
409
        align = gtk_alignment_new(0.0, 1.0, 1.0, 0.0);
 
410
        gtk_alignment_set_padding(GTK_ALIGNMENT(align), 12, 0 ,0, 0);
 
411
        gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, FALSE, 0);
 
412
 
 
413
#if GTK_CHECK_VERSION(3,0,0)
 
414
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
 
415
#else
410
416
        hbox = gtk_hbutton_box_new();
 
417
#endif
411
418
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
412
419
        gtk_box_set_spacing(GTK_BOX(hbox), 6);
413
 
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
 
420
        gtk_container_add(GTK_CONTAINER(align), hbox);
414
421
        but = bf_stock_cancel_button(G_CALLBACK(open_url_cancel_lcb), ou);
415
422
        gtk_box_pack_start(GTK_BOX(hbox), but, FALSE, TRUE, 0);
416
423
        but = bf_stock_ok_button(G_CALLBACK(open_url_ok_lcb), ou);