Changeset 8100


Ignore:
Timestamp:
Sep 19, 2018, 5:42:29 PM (14 months ago)
Author:
mabarracus
Message:

Fix bug closing wallpaper fileselector
Fix bug selecting local desktop items
Add compatibility with old profiles

Location:
syncer-plank/trunk/fuentes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • syncer-plank/trunk/fuentes/debian/changelog

    r7983 r8100  
     1syncer-plank (0.3.8.4) xenial; urgency=medium
     2
     3  * Fix bug closing wallpaper fileselector
     4  * Fix bug selecting local desktop items
     5  * Add compatibility with old profiles
     6
     7 -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 19 Sep 2018 17:40:55 +0200
     8
    19syncer-plank (0.3.8.3) unreleased; urgency=medium
    210
  • syncer-plank/trunk/fuentes/syncer-plank.install/usr/bin/syncer-plank-gui

    r7983 r8100  
    8888#
    8989def dbg(*args,**kwargs):
    90     enable=True
     90    enable=False
    9191    if enable:
    9292        for x in args:
     
    741741                    if content_item[0] == 'addcontent':
    742742                        workspace.append(type_item)
     743                    if content_item[0] == 'add':
     744                        workspace.append(['oldplank',content_item[1]])
    743745            to_remove=[]
    744746            for i in range(len(workspace)-1,-1,-1):
     
    750752                except:
    751753                    pass
    752             for i in to_remove:
     754            for i in sorted(to_remove,reverse=True):
    753755                del workspace[i]
     756            to_remove = []
    754757            for i in range(len(workspace)):
    755758                if workspace[i][0] in ['desktop','plank']:
    756759                    content = self.scan_desktop_file(filename=workspace[i][1], files_cache=self.ctl.files_cache)
    757760                    workspace[i].extend(list(content))
     761                if workspace[i][0] == 'oldplank':
     762                    done=False
     763                    for cl in self.ctl.model.cache_lists:
     764                        for clt in self.ctl.model.cache_lists[cl]:
     765                            if clt[2] == workspace[i][1]:
     766                                workspace[i]= ['plank']
     767                                workspace[i].extend([clt[3]])
     768                                workspace[i].extend(list(clt))
     769                                done=True
     770                            if done:
     771                                break
     772                        if done:
     773                            break
     774                    if not done:
     775                        to_remove.append(i)
     776            for i in sorted(to_remove,reverse=True):
     777                del workspace[i]
    758778            return workspace
    759779        except Exception as e:
     
    11851205    def close_btn_filechooser(self,*args,**kwargs):
    11861206        self.ctl.process(action='close_filechooser')
     1207        return True
    11871208
    11881209    def selection_changed(self,*args,**kwargs):
     
    15311552        iter = args[1]
    15321553
    1533         if model.get_value(iter,APPCOL.TYPE) != 'system':
     1554        type_item = model.get_value(iter,APPCOL.TYPE)
     1555        if type_item not in  ['system','local']:
    15341556            return False
    15351557        selected = None
    15361558        if self.ctl.current_selection == 'desktop':
    1537             selected = model.get_value(iter, APPCOL.SELECTED_DESKTOP)
     1559            if type_item == 'local':
     1560                return False
     1561            else:
     1562                selected = model.get_value(iter, APPCOL.SELECTED_DESKTOP)
     1563
    15381564        if self.ctl.current_selection == 'plank':
    15391565            selected = model.get_value(iter, APPCOL.SELECTED_PLANK)
  • syncer-plank/trunk/fuentes/syncer-plank.install/usr/lib/syncer-plank/gui_v3.glade

    r7983 r8100  
    23152315  <object class="GtkFileChooserDialog" id="filechooser">
    23162316    <property name="can_focus">False</property>
     2317    <property name="modal">True</property>
    23172318    <property name="default_width">640</property>
    23182319    <property name="default_height">480</property>
     2320    <property name="destroy_with_parent">True</property>
    23192321    <property name="type_hint">normal</property>
    23202322    <property name="transient_for">window_main</property>
     
    23232325    <property name="preview_widget">image1</property>
    23242326    <property name="use_preview_label">False</property>
     2327    <signal name="close" handler="close_btn_filechooser" swapped="no"/>
     2328    <signal name="delete-event" handler="close_btn_filechooser" swapped="no"/>
    23252329    <signal name="file-activated" handler="selection_changed" swapped="no"/>
    23262330    <signal name="update-preview" handler="selection_preview" swapped="no"/>
Note: See TracChangeset for help on using the changeset viewer.