/[svn]/gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3300 by schoenebeck, Sun Jul 9 18:15:02 2017 UTC revision 3339 by schoenebeck, Sun Jul 30 18:57:35 2017 UTC
# Line 23  Line 23 
23  #include <gtkmm/stock.h>  #include <gtkmm/stock.h>
24  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
25  #include <gtkmm/label.h>  #include <gtkmm/label.h>
26    #include <gtk/gtkwidget.h> // for gtk_widget_modify_*()
27    
28  Glib::ustring dimTypeAsString(gig::dimension_t d);  Glib::ustring dimTypeAsString(gig::dimension_t d);
29    
# Line 885  CombineInstrumentsDialog::CombineInstrum Line 886  CombineInstrumentsDialog::CombineInstrum
886      {      {
887          Gdk::Color white;          Gdk::Color white;
888          white.set("#ffffff");          white.set("#ffffff");
889          m_iconView.modify_base(Gtk::STATE_SELECTED, white);          GtkWidget* widget = (GtkWidget*) m_iconView.gobj();
890          m_iconView.modify_base(Gtk::STATE_ACTIVE, white);          gtk_widget_modify_base(widget, GTK_STATE_SELECTED, white.gobj());
891          m_iconView.modify_bg(Gtk::STATE_SELECTED, white);          gtk_widget_modify_base(widget, GTK_STATE_ACTIVE, white.gobj());
892          m_iconView.modify_bg(Gtk::STATE_ACTIVE, white);          gtk_widget_modify_bg(widget, GTK_STATE_SELECTED, white.gobj());
893            gtk_widget_modify_bg(widget, GTK_STATE_ACTIVE, white.gobj());
894      }      }
895    
896      m_labelOrder.set_text(_("Order of the instruments to be combined:"));      m_labelOrder.set_text(_("Order of the instruments to be combined:"));
# Line 942  CombineInstrumentsDialog::CombineInstrum Line 944  CombineInstrumentsDialog::CombineInstrum
944          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_WARNING);          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_WARNING);
945          msg.run();          msg.run();
946      }      }
947    
948        // OK button should have focus by default for quick combining with Return key
949        m_OKButton.grab_focus();
950  }  }
951    
952  void CombineInstrumentsDialog::on_order_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)  void CombineInstrumentsDialog::on_order_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
# Line 1067  void CombineInstrumentsDialog::setSelect Line 1072  void CombineInstrumentsDialog::setSelect
1072          if (instrumentIndeces.count(index))          if (instrumentIndeces.count(index))
1073              m_treeView.get_selection()->select(iter);              m_treeView.get_selection()->select(iter);
1074      }      }
1075        // hack: OK button lost focus after doing the above, it should have focus by default for quick combining with Return key
1076        m_OKButton.grab_focus();
1077  }  }
1078    
1079  void CombineInstrumentsDialog::combineSelectedInstruments() {  void CombineInstrumentsDialog::combineSelectedInstruments() {
Legend:
Removed from v.3300  
changed lines
  Added in v.3339
  ViewVC Help
Powered by ViewVC