diff --git a/sharepoint_browser.py b/sharepoint_browser.py index 8bd37ed..b0edf18 100644 --- a/sharepoint_browser.py +++ b/sharepoint_browser.py @@ -825,18 +825,24 @@ class SharePointApp(wx.Frame): if len(selected_indices) == 1: item = selected_items[0] + added_fav = False if item['type'] in ["FOLDER", "DRIVE", "SITE"]: fav_item = menu.Append(wx.ID_ANY, self.get_txt("btn_add_fav")) fav_item.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_ADD_BOOKMARK, wx.ART_MENU, (16, 16))) self.Bind(wx.EVT_MENU, lambda e, i=item: self.add_favorite(i), fav_item) - menu.AppendSeparator() + added_fav = True + added_file_action = False if item['type'] == "FILE": + if added_fav: menu.AppendSeparator() edit_item = menu.Append(wx.ID_ANY, self.get_txt("msg_edit_file")) edit_item.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_EDIT, wx.ART_MENU, (16, 16))) self.Bind(wx.EVT_MENU, lambda e, i=item: self.open_file(i), edit_item) + added_file_action = True + added_folder_action = False if item['type'] in ["FILE", "FOLDER"]: + if added_fav and not added_file_action: menu.AppendSeparator() rename_item = menu.Append(wx.ID_ANY, f"{self.get_txt('msg_rename')} '{item['name']}'") rename_item.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_REPORT_VIEW, wx.ART_MENU, (16, 16))) self.Bind(wx.EVT_MENU, lambda e: self.on_rename_clicked(item), rename_item) @@ -844,10 +850,12 @@ class SharePointApp(wx.Frame): delete_item = menu.Append(wx.ID_ANY, f"{self.get_txt('msg_delete')} '{item['name']}'") delete_item.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_DELETE, wx.ART_MENU, (16, 16))) self.Bind(wx.EVT_MENU, lambda e: self.on_delete_items_clicked(selected_items), delete_item) + added_folder_action = True # Åbn i browser if item.get('web_url'): - menu.AppendSeparator() + if added_fav or added_file_action or added_folder_action: + menu.AppendSeparator() web_item = menu.Append(wx.ID_ANY, self.get_txt("msg_open_browser")) web_item.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_GO_FORWARD, wx.ART_MENU, (16, 16))) self.Bind(wx.EVT_MENU, lambda e, url=item['web_url']: webbrowser.open(url), web_item) @@ -1526,7 +1534,7 @@ class SharePointApp(wx.Frame): self.headers = {'Authorization': f'Bearer {self.access_token}'} self.login_btn.Disable() # self.login_btn.Hide() # Valgfrit: Skjul login knap helt når vi er inde - self.login_btn.SetLabel(self.get_txt("btn_logged_in")) + self.login_btn.SetLabel(self.get_txt("btn_logged_in") if not getattr(self, "compact_mode", False) else "") self.login_btn.SetBackgroundColour(wx.Colour(200, 200, 200)) # Grå self.home_btn.Enable() self.refresh_btn.Enable()