Skip to content

Commit

Permalink
Refactoring names
Browse files Browse the repository at this point in the history
  • Loading branch information
@dralley
dralley committed May 2, 2016
1 parent 1f71cb7 commit 17edd59
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 81 deletions.
2 changes: 1 addition & 1 deletion makepot
View file
@@ -1,3 +1,3 @@
#!/bin/bash

xgettext --language=Python --keyword=_ --output=mintupload.pot usr/lib/linuxmint/mintupload/mintUpload.py usr/lib/linuxmint/mintupload/mintUploadCore.py usr/lib/linuxmint/mintupload/file-uploader.py usr/lib/linuxmint/mintupload/upload-manager.py generate_desktop_files
xgettext --language=Python --keyword=_ --output=mintupload.pot usr/lib/linuxmint/mintupload/mintupload.py usr/lib/linuxmint/mintupload/mintupload_core.py usr/lib/linuxmint/mintupload/file-uploader.py usr/lib/linuxmint/mintupload/upload-manager.py generate_desktop_files
102 changes: 51 additions & 51 deletions mintupload.pot
View file
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-04-01 23:48-0400\n"
"POT-Creation-Date: 2016-04-21 16:06-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -17,188 +17,188 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: usr/lib/linuxmint/mintupload/mintUpload.py:28
#: usr/lib/linuxmint/mintupload/mintupload.py:28
#: usr/lib/linuxmint/mintupload/upload-manager.py:27
#: usr/lib/linuxmint/mintupload/upload-manager.py:78
#: usr/lib/linuxmint/mintupload/upload-manager.py:112
#: generate_desktop_files:27 generate_desktop_files:41
msgid "Upload Manager"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:43
#: usr/lib/linuxmint/mintupload/mintUpload.py:137
#: usr/lib/linuxmint/mintupload/mintupload.py:43
#: usr/lib/linuxmint/mintupload/mintupload.py:137
#, python-format
msgid "%(percentage)s of %(number)d files - Uploading to %(service)s"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:45
#: usr/lib/linuxmint/mintupload/mintUpload.py:140
#: usr/lib/linuxmint/mintupload/mintupload.py:45
#: usr/lib/linuxmint/mintupload/mintupload.py:140
#, python-format
msgid "%(percentage)s of 1 file - Uploading to %(service)s"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:81
#: usr/lib/linuxmint/mintupload/mintupload.py:81
#, python-format
msgid "The upload to '%(service)s' was cancelled"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:93
#: usr/lib/linuxmint/mintupload/mintupload.py:93
#, python-format
msgid "Upload to '%s' failed: "
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:99
#: usr/lib/linuxmint/mintupload/mintupload.py:99
#, python-format
msgid "Successfully uploaded %(number)d files to '%(service)s'"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:101
#: usr/lib/linuxmint/mintupload/mintupload.py:101
#, python-format
msgid "Successfully uploaded 1 file to '%(service)s'"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:111
#: usr/lib/linuxmint/mintupload/mintupload.py:111
msgid "Do you want to cancel this upload?"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:112
#: usr/lib/linuxmint/mintupload/mintupload.py:112
msgid "Cancel"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:113
#: usr/lib/linuxmint/mintupload/mintupload.py:113
msgid "Run in the background"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:116
#: usr/lib/linuxmint/mintupload/mintupload.py:116
msgid "Cancel upload?"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:136
#: usr/lib/linuxmint/mintupload/mintupload.py:136
#, python-format
msgid "Uploading %(number)d files to %(service)s"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:139
#: usr/lib/linuxmint/mintupload/mintupload.py:139
#, python-format
msgid "Uploading 1 file to %(service)s"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:158
#: usr/lib/linuxmint/mintupload/mintupload.py:158
#, python-format
msgid ""
"%(size_so_far)s of %(total_size)s - %(time_remaining)s left (%(speed)s/sec)"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:160
#: usr/lib/linuxmint/mintupload/mintupload.py:160
#, python-format
msgid "%(size_so_far)s of %(total_size)s"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:187
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:90
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:92
#: usr/lib/linuxmint/mintupload/mintupload.py:187
#: usr/lib/linuxmint/mintupload/mintupload_core.py:90
#: usr/lib/linuxmint/mintupload/mintupload_core.py:92
msgid "B"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:189
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:92
#: usr/lib/linuxmint/mintupload/mintupload.py:189
#: usr/lib/linuxmint/mintupload/mintupload_core.py:92
msgid "KB"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:191
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:92
#: usr/lib/linuxmint/mintupload/mintupload.py:191
#: usr/lib/linuxmint/mintupload/mintupload_core.py:92
msgid "MB"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:193
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:92
#: usr/lib/linuxmint/mintupload/mintupload.py:193
#: usr/lib/linuxmint/mintupload/mintupload_core.py:92
msgid "GB"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:200
#: usr/lib/linuxmint/mintupload/mintupload.py:200
#, python-format
msgid "%(hours)d hours, %(minutes)d minutes"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:202
#: usr/lib/linuxmint/mintupload/mintupload.py:202
#, python-format
msgid "1 hour, %d minutes"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:204
#: usr/lib/linuxmint/mintupload/mintupload.py:204
#, python-format
msgid "%(minutes)d minutes, %(seconds)d seconds"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:206
#: usr/lib/linuxmint/mintupload/mintupload.py:206
#, python-format
msgid "1 minute, %d seconds"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:208
#: usr/lib/linuxmint/mintupload/mintupload.py:208
#, python-format
msgid "%d seconds"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUpload.py:237
#: usr/lib/linuxmint/mintupload/mintupload.py:237
#, python-format
msgid "Unknown service: %s"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:90
#: usr/lib/linuxmint/mintupload/mintupload_core.py:90
msgid "KiB"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:90
#: usr/lib/linuxmint/mintupload/mintupload_core.py:90
msgid "MiB"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:90
#: usr/lib/linuxmint/mintupload/mintupload_core.py:90
msgid "GiB"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:132
#: usr/lib/linuxmint/mintupload/mintupload_core.py:132
msgid "File larger than service's maximum"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:142
#: usr/lib/linuxmint/mintupload/mintupload_core.py:142
msgid "Could not get available space"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:145
#: usr/lib/linuxmint/mintupload/mintupload_core.py:145
msgid "File larger than service's available space"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:170
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:341
#: usr/lib/linuxmint/mintupload/mintupload_core.py:170
#: usr/lib/linuxmint/mintupload/mintupload_core.py:341
msgid "File uploaded successfully."
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:188
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:248
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:293
#: usr/lib/linuxmint/mintupload/mintupload_core.py:188
#: usr/lib/linuxmint/mintupload/mintupload_core.py:248
#: usr/lib/linuxmint/mintupload/mintupload_core.py:293
msgid "connection successfully established"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:199
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:259
#: usr/lib/linuxmint/mintupload/mintupload_core.py:199
#: usr/lib/linuxmint/mintupload/mintupload_core.py:259
msgid "Uploading the file..."
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:236
#: usr/lib/linuxmint/mintupload/mintupload_core.py:236
msgid "This service requires a password or private key."
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:301
#: usr/lib/linuxmint/mintupload/mintupload_core.py:301
msgid "This service requires a password."
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:334
#: usr/lib/linuxmint/mintupload/mintupload_core.py:334
msgid "URL:"
msgstr ""

#: usr/lib/linuxmint/mintupload/mintUploadCore.py:374
#: usr/lib/linuxmint/mintupload/mintUploadCore.py:378
#: usr/lib/linuxmint/mintupload/mintupload_core.py:374
#: usr/lib/linuxmint/mintupload/mintupload_core.py:378
#, python-format
msgid "%(1)s is not set in the config file found under %(2)s or %(3)s"
msgstr ""
Expand Down
48 changes: 24 additions & 24 deletions usr/lib/linuxmint/mintupload/file-uploader.py
View file
Expand Up @@ -11,7 +11,7 @@
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, Gdk, GLib

from mintUploadCore import *
from mintupload_core import *

# i18n
gettext.install("mintupload", "/usr/share/linuxmint/locale")
Expand All @@ -25,40 +25,40 @@

class NotifyThread(threading.Thread):

def __init__(self, mainClass):
def __init__(self, main_class):
threading.Thread.__init__(self)
self.mainClass = mainClass
self.main_class = main_class

def run(self):
global shutdown_flag
while not shutdown_flag:
try:
time.sleep(1)
GLib.idle_add(self.mainClass.reload_services)
GLib.idle_add(self.main_class.reload_services)
except:
pass


class MainClass:

def __init__(self):
self.dropZones = {}
self.drop_zones = {}

self.statusIcon = Gtk.StatusIcon()
self.statusIcon.set_from_file(SYSTRAY_ICON)
self.status_icon = Gtk.StatusIcon()
self.status_icon.set_from_file(SYSTRAY_ICON)

try:
desktop = os.environ["DESKTOP_SESSION"].lower()
if desktop == "mate":
self.statusIcon.set_from_icon_name("up")
self.status_icon.set_from_icon_name("up")
except Exception, detail:
print detail

self.statusIcon.set_tooltip_text(_("Upload services"))
self.statusIcon.set_visible(True)
self.status_icon.set_tooltip_text(_("Upload services"))
self.status_icon.set_visible(True)

self.statusIcon.connect('popup-menu', self.popup_menu_cb)
self.statusIcon.connect('activate', self.show_menu_cb)
self.status_icon.connect('popup-menu', self.popup_menu_cb)
self.status_icon.connect('activate', self.show_menu_cb)

self.reload_services()
notifyT = NotifyThread(self)
Expand Down Expand Up @@ -98,14 +98,14 @@ def launch_manager(self, widget):
os.system("/usr/lib/linuxmint/mintupload/upload-manager.py &")

def create_drop_zone(self, widget, service):
if service['name'] not in self.dropZones.keys():
dropZone = DropZone(self.statusIcon, self.menu, service, self.dropZones)
self.dropZones[service['name']] = dropZone
if service['name'] not in self.drop_zones.keys():
drop_zone = DropZone(self.status_icon, self.menu, service, self.drop_zones)
self.drop_zones[service['name']] = drop_zone
else:
self.dropZones[service['name']].show()
self.drop_zones[service['name']].show()

def quit_cb(self, widget):
self.statusIcon.set_visible(False)
self.status_icon.set_visible(False)
global shutdown_flag
shutdown_flag = True
Gtk.main_quit()
Expand All @@ -118,15 +118,15 @@ def popup_menu_cb(self, widget, button, activate_time):
self.menu.popup(None, None, self.menu_pos, None, button, activate_time)

def menu_pos(self, menu, fake):
return self.statusIcon.position_menu(self.menu, self.statusIcon)
return self.status_icon.position_menu(self.menu, self.status_icon)


class DropZone:

def __init__(self, statusIcon, menu, service, dropZones):
def __init__(self, status_icon, menu, service, drop_zones):
self.service = service
self.statusIcon = statusIcon
self.dropZones = dropZones
self.status_icon = status_icon
self.drop_zones = drop_zones
self.menu = menu
self.w = Gtk.Window()

Expand All @@ -144,8 +144,8 @@ def __init__(self, statusIcon, menu, service, dropZones):
self.w.set_skip_taskbar_hint(True)
self.w.stick()

pos = Gtk.status_icon_position_menu(self.menu, self.statusIcon)
posY = len(self.dropZones) * 80
pos = Gtk.status_icon_position_menu(self.menu, self.status_icon)
posY = len(self.drop_zones) * 80
self.w.move(pos[0], pos[1] + 50 - posY)

self.label = Gtk.Label()
Expand Down Expand Up @@ -190,7 +190,7 @@ def drop_data_received_cb(self, widget, context, x, y, selection, targetType, ti
os.system("mintupload \"" + self.service['name'] + "\" " + " ".join(filenames) + " &")

def destroy_cb(self, wid):
del self.dropZones[self.service['name']]
del self.drop_zones[self.service['name']]

MainClass()
Gtk.main()
2 changes: 1 addition & 1 deletion usr/lib/linuxmint/mintupload/launch-file-uploader.py
View file
@@ -1,7 +1,7 @@
#!/usr/bin/python2

import os
from mintUploadCore import *
from mintupload_core import *

services = read_services()
if len(services) > 0:
Expand Down

0 comments on commit 17edd59

Please sign in to comment.