Permalink
Browse files

added show menu

  • Loading branch information...
1 parent 02fd1b6 commit ead7563b3819a6b67d9aeeebd49f846f80bddb1a @bahniks committed Aug 10, 2014
Showing with 25 additions and 5 deletions.
  1. +5 −3 Stuff/Modules/filestorage.py
  2. +19 −1 Stuff/Modules/menu.py
  3. +1 −1 Stuff/Modules/showtracks.py
@@ -186,7 +186,7 @@ def __init__(self, root, files):
super().__init__(root)
self.root = root
- self.fileStorage = self.root.root.root.fileStorage
+ self.fileStorage = m.fs[m.mode]
self["padx"] = 4
self["pady"] = 4
@@ -312,7 +312,7 @@ def removeFun(self):
elif self.shownFiles == "wrongfiles":
self.fileStorage.wrongfiles.remove(file)
self.filesTree.delete(file)
- self.root.root.fileStorageFrame.update()
+ self.root.update()
def cropFun(self):
@@ -367,7 +367,7 @@ def refresh(self):
else:
self.initfiles = self.fileStorage.wrongfiles
self.initialize()
- self.root.root.fileStorageFrame.update()
+ self.root.update()
def showWrongfilesFun(self):
@@ -430,13 +430,15 @@ def untagFilesFun(self):
for file in self.filesTree.selection():
if file in self.fileStorage.tagged:
self.untagFun(file)
+ self.root.update()
def tagFilesFun(self):
"tags selected files"
for file in self.filesTree.selection():
if file not in self.fileStorage.tagged:
self.tagFun(file)
+ self.root.update()
def openRoomFile(self, arenafile):
View
@@ -32,8 +32,9 @@
from optionget import optionGet
from helpcmm import HelpCM
from tools import saveFileStorage, loadFileStorage, addTags
+from showtracks import ShowTracks
from window import placeWindow
-from filestorage import FileStorage
+from filestorage import FileStorage, ShowFiles
import version
import mode as m
@@ -51,13 +52,15 @@ def __init__(self, root):
self.menu_file = Menu(self)
self.menu_options = Menu(self)
self.menu_tools = Menu(self)
+ self.menu_show = Menu(self)
self.menu_task = Menu(self)
self.menu_help = Menu(self)
menuWidth = 8
self.add_cascade(menu = self.menu_file, label = "{:^{}}".format("File", menuWidth))
self.add_cascade(menu = self.menu_options, label = "{:^{}}".format("Options", menuWidth))
self.add_cascade(menu = self.menu_tools, label = "{:^{}}".format("Tools", menuWidth))
+ self.add_cascade(menu = self.menu_show, label = "{:^{}}".format("Show", menuWidth))
self.add_cascade(menu = self.menu_task, label = "{:^{}}".format("Task", menuWidth))
self.add_cascade(menu = self.menu_help, label = "{:^{}}".format("Help", menuWidth))
@@ -74,6 +77,8 @@ def __init__(self, root):
self.menu_options.add_separator()
self.menu_options.add_command(label = "Reset all options", command = self.resetOptions)
self.menu_tools.add_command(label = "Add tags", command = self.addTagsHelper)
+ self.menu_show.add_command(label = "Show files", command = self.showFiles)
+ self.menu_show.add_command(label = "Show tracks", command = self.showTracks)
for task, name in m.fullname.items():
self.menu_task.add_radiobutton(label = name, variable = self.task, value = task,
command = self.changedTask)
@@ -115,6 +120,19 @@ def addTagsHelper(self):
messagebox.showinfo(message = "Sorry, something went wrong.", detail = e,
title = "Error", icon = "error")
+ def showFiles(self):
+ tabid = self.root.selectFunction.index(self.root.selectFunction.select())
+ ShowFiles(m.slaves[m.mode][0][tabid].fileStorageFrame, "arenafiles")
+
+ def showTracks(self):
+ if m.fs[m.mode]:
+ tabid = self.root.selectFunction.index(self.root.selectFunction.select())
+ root = m.slaves[m.mode][0][tabid].fileStorageFrame
+ ShowTracks(root, m.fs[m.mode].arenafiles, m.fs[m.mode].arenafiles[0])
+ else:
+ messagebox.showinfo(message = "You have not selected any files.",
+ title = "No files selected", icon = "info")
+
def resetOptions(self):
text = ("Are you sure that you want to reset all options (including parameter settings)"
" to default settings?")
@@ -41,7 +41,7 @@ def __init__(self, root, tracks, nameA, controlled = False):
self.controlled = controlled
self.tracks = tracks
self.root = root
- self.fileStorage = self.root.fileStorage
+ self.fileStorage = m.fs[m.mode]
self.index = self.tracks.index(nameA)
self.enabledManualReflectionsRemoval = False
self.size = 6 # size of a mouse circle for reflection removal

0 comments on commit ead7563

Please sign in to comment.