Skip to content

Commit

Permalink
Moves the version setting for the windowTitle to the beginnig of __in…
Browse files Browse the repository at this point in the history
…it__
  • Loading branch information
yafesdev committed Nov 17, 2019
1 parent d7a597d commit ddbc613
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion syncsketchGUI/installScripts/maintenance.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def handleUpgrade():
if getVersionDifference():
logger.info("YOU ARE {} VERSIONS BEHIND".format(getVersionDifference()))
if os.getenv("SS_DISABLE_UPGRADE"):
logger.info("The environment-Value SS_DISABLE_UPGRADE is set, skipping upgrade")
logger.warning("Upgrades disabled as environment Variable SS_DISABLE_UPGRADE is set, skipping")
return
#Let's first make sure to replace the installerGui with the latest.
# * we might restore old file if not continued from here
Expand Down
9 changes: 5 additions & 4 deletions syncsketchGUI/lib/gui/syncsketchWidgets/mainWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def __init__(self, parent):
self.update_login_ui()

#Not logged in or outdated api, token
self.setWindowTitle("Syncsketch - Version: {}".format(getLatestSetupPyFileFromLocal()))
if not self.accountData:
return

Expand All @@ -60,7 +61,7 @@ def __init__(self, parent):
#Populate Treewidget with all items
#self.asyncPopulateTree(withItems=True)
self.restore_ui_state()
self.setWindowTitle("Syncsketch - Version: {}".format(getLatestSetupPyFileFromLocal()))



def storeReviewData(self, s):
Expand Down Expand Up @@ -893,7 +894,7 @@ def select_item_from_target_input(self, event=None):

if not link:
link = database.read_cache('upload_to_value')
logger.warning("No link, reading from cache: {} ".format(link))
logger.info("No link, reading from cache: {} ".format(link))
#ids = get_ids_from_link(link)
url_payload = parse_url_data(link)
logger.info("url_payload: {} ".format(url_payload))
Expand Down Expand Up @@ -1230,8 +1231,8 @@ def retrievePanelData(self):
return

self.current_user = user.SyncSketchUser()
logger.warning("CurrentUser: {}".format(self.current_user))
logger.warning("isLoggedin: {}".format(self.current_user.is_logged_in()))
logger.info("CurrentUser: {}".format(self.current_user))
logger.info("isLoggedin: {}".format(self.current_user.is_logged_in()))
# Always refresh Tree View
self.ui.browser_treeWidget.clear()

Expand Down
2 changes: 1 addition & 1 deletion syncsketchGUI/lib/gui/syncsketchWidgets/webLoginWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def changed(self):
jsonData = self.page().mainFrame().evaluateJavaScript(command)
if isinstance(jsonData, unicode):
tokenData = json.loads(jsonData)
logger.warning("tokenData: {0}".format(tokenData))
logger.info("tokenData: {0}".format(tokenData))
self.current_user.set_name(tokenData["email"])
self.current_user.set_token(tokenData["token"])
self.current_user.set_api_key(tokenData["token"])
Expand Down

0 comments on commit ddbc613

Please sign in to comment.