jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.7'

Browse source
This commit is contained in:
Norbert Schechner 2016-03-30 22:00:53 +02:00
commit 669f5fe4aa
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/python/gladevcp/iconview.py
View file

@ -143,7 +143,7 @@ class IconFileSelection(gtk.HBox):
# image.set_from_stock(gtk.STOCK_GO_DOWN,48) # image.set_from_stock(gtk.STOCK_GO_DOWN,48)
# self.btn_go_down.set_image(image) # self.btn_go_down.set_image(image)
# self.buttonbox.add(self.btn_go_down) # self.buttonbox.add(self.btn_go_down)
#
# self.btn_go_up = gtk.Button() # self.btn_go_up = gtk.Button()
# self.btn_go_up.set_size_request(56,56) # self.btn_go_up.set_size_request(56,56)
# image = gtk.Image() # image = gtk.Image()
@ -205,15 +205,17 @@ class IconFileSelection(gtk.HBox):
# self.btn_go_down.connect("clicked", self.on_btn_go_down_clicked) # self.btn_go_down.connect("clicked", self.on_btn_go_down_clicked)
# self.btn_go_up.connect("clicked", self.on_btn_go_up_clicked) # self.btn_go_up.connect("clicked", self.on_btn_go_up_clicked)
self.btn_jump_to.connect("clicked", self.on_btn_jump_to_clicked) self.btn_jump_to.connect("clicked", self.on_btn_jump_to_clicked)
self.btn_select.connect("clicked", self.on_btn_get_selected_clicked) self.btn_select.connect("clicked", self.on_btn_select_clicked)
self.btn_exit.connect("clicked", self.on_btn_exit_clicked) self.btn_exit.connect("clicked", self.on_btn_exit_clicked)
# will be emitted, when a icon has been activated, so we keep track of the path # will be emitted, when a icon has been activated, so we keep track of the path
self.iconView.connect("item-activated", self._on_item_activated) self.iconView.connect("item-activated", self._on_item_activated)
# will be emitted, when a icon is activated and the ENTER key has been pressed # will be emitted, when a icon is activated and the ENTER key has been pressed
self.iconView.connect("activate-cursor-item", self._on_activate_cursor_item) self.iconView.connect("activate-cursor-item", self._on_activate_cursor_item)
# will be emmited if the selection has changed, this happens also if the user clicks ones on an icon
self.iconView.connect("selection-changed", self._on_selection_changed)
# will be emitted, when the widget is destroyed # will be emitted, when the widget is destroyed
self.connect("destroy", gtk.main_quit) self.connect("destroy", gtk.main_quit)
self.add(vbox) self.add(vbox)
self.show_all() self.show_all()
@ -442,6 +444,15 @@ class IconFileSelection(gtk.HBox):
# ToDo: find out how to move a line down or up # ToDo: find out how to move a line down or up
# def on_btn_go_down_clicked(self,data): # def on_btn_go_down_clicked(self,data):
# print("This is the number of the icon selected", self.iconView.get_cursor())
# col = self.iconView.get_item_column(self.iconView.get_cursor()[0])
# row = self.iconView.get_item_row(self.iconView.get_cursor()[0])
# print("This is the column :", col)
# print("This is the row :", row)
# print(self.iconView.get_columns())
# self.iconView.item_activated(self.iconView.get_cursor()[0])
# print("go down") # print("go down")
# print("columns = ",self.iconView.get_columns()) # print("columns = ",self.iconView.get_columns())
# print("column spacing = ", self.iconView.get_column_spacing()) # print("column spacing = ", self.iconView.get_column_spacing())
@ -449,10 +460,10 @@ class IconFileSelection(gtk.HBox):
# print("margin = ", self.iconView.get_margin()) # print("margin = ", self.iconView.get_margin())
# print("visible range = ", self.iconView.get_visible_range()) # print("visible range = ", self.iconView.get_visible_range())
# print("get cursor = ", self.iconView.get_cursor()) # print("get cursor = ", self.iconView.get_cursor())
# print("item row = ", self.iconView.get_item_at_row(self.get_selected())) # #print("item row = ", self.iconView.get_item_at_row(self.get_selected()))
# print("item column = ", self.iconView.get_item_column(self.get_selected())) # print("item column = ", self.iconView.get_item_column(self.get_selected()))
#
#
# def on_btn_go_up_clicked(self,data): # def on_btn_go_up_clicked(self,data):
# print("go up") # print("go up")
# ToDo: end # ToDo: end
@ -477,9 +488,9 @@ class IconFileSelection(gtk.HBox):
self._fill_store() self._fill_store()
def get_selected(self): def get_selected(self):
return on_btn_get_selected_clicked(self) return self.on_btn_select_clicked(self)
def on_btn_get_selected_clicked(self, data): def on_btn_select_clicked(self, data):
#try: #try:
self.iconView.item_activated(self.iconView.get_cursor()[0]) self.iconView.item_activated(self.iconView.get_cursor()[0])
if self.path: if self.path:
@ -510,6 +521,11 @@ class IconFileSelection(gtk.HBox):
# This is only to advise, that the selection wasn't a file, but an directory # This is only to advise, that the selection wasn't a file, but an directory
self.path = None self.path = None
def _on_selection_changed(self, widget):
if not self.btn_select.get_sensitive():
self.btn_select.set_sensitive(True)
self.check_button_state()
def on_btn_dir_up_clicked(self, widget): def on_btn_dir_up_clicked(self, widget):
self.cur_dir = os.path.dirname(self.cur_dir) self.cur_dir = os.path.dirname(self.cur_dir)
self._fill_store() self._fill_store()