[lightlang] r947 committed - Рефакторинг

[ligh...@googlecode.com]

Revision: 947
Author: mdevaev
Date: Sun Feb 21 15:04:44 2010
Log: Рефакторинг
http://code.google.com/p/lightlang/source/detail?r=947

Modified:
/trunk/lightlang/apps/xsl/src/pyqt4/GoogleTranslatePanel.py
/trunk/lightlang/apps/xsl/src/pyqt4/HistoryPanel.py
/trunk/lightlang/apps/xsl/src/pyqt4/MainWindow.py
/trunk/lightlang/apps/xsl/src/pyqt4/SlSearchPanel.py

=======================================
--- /trunk/lightlang/apps/xsl/src/pyqt4/GoogleTranslatePanel.py Sat Feb 20
14:17:31 2010
+++ /trunk/lightlang/apps/xsl/src/pyqt4/GoogleTranslatePanel.py Sun Feb 21
15:04:44 2010
@@ -139,10 +139,22 @@
### Public ###

def requisites(self) :
- return [ Qt.QIcon(IconsDir+"web_16.png"), self.windowTitle(),
Qt.Qt.LeftDockWidgetArea, Qt.QKeySequence("Ctrl+G") ]
+ return {
+ "icon" : Qt.QIcon(IconsDir+"web_16.png"),
+ "title" : self.windowTitle(),
+ "area" : Qt.Qt.LeftDockWidgetArea,
+ "hotkey" : Qt.QKeySequence("Ctrl+G")
+ }

def translateMethods(self) :
- return [ [tr("Google Translate"), self.objectName(), "googleTranslate",
self.googleTranslateMethod] ]
+ return [
+ {
+ "title" : tr("Google Translate"),
+ "object_name" : self.objectName(),
+ "method_name" : self.googleTranslateMethod.__name__,
+ "method" : self.googleTranslateMethod
+ }
+ ]

###

=======================================
--- /trunk/lightlang/apps/xsl/src/pyqt4/HistoryPanel.py Wed Jan 20 14:12:57
2010
+++ /trunk/lightlang/apps/xsl/src/pyqt4/HistoryPanel.py Sun Feb 21 15:04:44
2010
@@ -81,7 +81,12 @@
### Public ###

def requisites(self) :
- return [ Qt.QIcon(IconsDir+"history_16.png"), self.windowTitle(),
Qt.Qt.LeftDockWidgetArea, Qt.QKeySequence("Ctrl+H") ]
+ return {
+ "icon" : Qt.QIcon(IconsDir+"history_16.png"),
+ "title" : self.windowTitle(),
+ "area" : Qt.Qt.LeftDockWidgetArea,
+ "hotkey" : Qt.QKeySequence("Ctrl+H")
+ }

###

=======================================
--- /trunk/lightlang/apps/xsl/src/pyqt4/MainWindow.py Fri Jan 22 08:18:18
2010
+++ /trunk/lightlang/apps/xsl/src/pyqt4/MainWindow.py Sun Feb 21 15:04:44
2010
@@ -316,13 +316,13 @@
self.panels_focus_flags_list.append(False)

requisites = panel.requisites()
- self.addDockWidget(requisites[2], panel)
+ self.addDockWidget(requisites["area"], panel)
if len(self.panels_list) > 1 :
self.tabifyDockWidget(self.panels_list[-2], self.panels_list[-1])
- self.panels_menu.addAction(requisites[0], requisites[1], panel.show,
requisites[3])
+ self.panels_menu.addAction(requisites["icon"], requisites["title"],
panel.show, requisites["hotkey"])

def addSourceObject(self, source_object) :
- self.source_objects_list.append([source_object, -1])
+ self.source_objects_list.append({ "object" : source_object, "index" : -1
})

index = len(self.source_objects_list) - 1

@@ -339,24 +339,24 @@
set_translate_window_text = ( lambda text :
self.setTranslateWindowText(text) )
clear_translate_window = ( lambda : self.clearTranslateWindow() )

- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("processStarted()"), registrate_stream)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("processStarted()"), status_bar_start_wait_movie)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("processFinished()"), release_stream)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("processFinished()"), status_bar_stop_wait_movie)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("clearRequest()"), clear_tabbed_translate_browser)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("clearRequest()"), clear_translate_window)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("wordChanged(const QString &)"),
set_tabbed_translate_browser_caption)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("wordChanged(const QString &)"), set_translate_window_caption)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("textChanged(const QString &)"),
set_tabbed_translate_browser_text)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("textChanged(const QString &)"), set_translate_window_text)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("newTabRequest()"), add_tabbed_translate_browser_tab)
- self.connect(self.source_objects_list[index][0],
Qt.SIGNAL("statusChanged(const QString &)"), status_bar_show_status_message)
-
- for translate_methods_list_item in
self.source_objects_list[index][0].translateMethods() :
- signal_string =
self.spy_menu.addTranslateMethod(translate_methods_list_item[0],
- translate_methods_list_item[1], translate_methods_list_item[2])
- self.connect(self.spy_menu, Qt.SIGNAL(signal_string),
translate_methods_list_item[3])
- self.connect(self.spy_menu, Qt.SIGNAL(signal_string),
self.source_objects_list[index][0].show)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("processStarted()"), registrate_stream)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("processStarted()"), status_bar_start_wait_movie)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("processFinished()"), release_stream)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("processFinished()"), status_bar_stop_wait_movie)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("clearRequest()"), clear_tabbed_translate_browser)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("clearRequest()"), clear_translate_window)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("wordChanged(const QString &)"),
set_tabbed_translate_browser_caption)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("wordChanged(const QString &)"), set_translate_window_caption)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("textChanged(const QString &)"),
set_tabbed_translate_browser_text)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("textChanged(const QString &)"), set_translate_window_text)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("newTabRequest()"), add_tabbed_translate_browser_tab)
+ self.connect(self.source_objects_list[index]["object"],
Qt.SIGNAL("statusChanged(const QString &)"), status_bar_show_status_message)
+
+ for translate_methods_list_item in
self.source_objects_list[index]["object"].translateMethods() :
+ signal_string =
self.spy_menu.addTranslateMethod(translate_methods_list_item["title"],
+ translate_methods_list_item["object_name"],
translate_methods_list_item["method_name"])
+ self.connect(self.spy_menu, Qt.SIGNAL(signal_string),
translate_methods_list_item["method"])
+ self.connect(self.spy_menu, Qt.SIGNAL(signal_string),
self.source_objects_list[index]["object"].show)

###

@@ -364,30 +364,30 @@
self.tabbed_translate_browser.setShredLock(True)
tabbed_translate_browser_index =
self.tabbed_translate_browser.currentIndex()
for source_objects_list_item in self.source_objects_list :
- if source_objects_list_item[1] == tabbed_translate_browser_index :
+ if source_objects_list_item["index"] == tabbed_translate_browser_index :
self.tabbed_translate_browser.addTab()
tabbed_translate_browser_index =
self.tabbed_translate_browser.currentIndex()
break
- self.source_objects_list[source_object_index][1] =
tabbed_translate_browser_index
+ self.source_objects_list[source_object_index]["index"] =
tabbed_translate_browser_index

def releaseStream(self, source_object_index) :
self.tabbed_translate_browser.setShredLock(False)
- self.source_objects_list[source_object_index][1] = -1
+ self.source_objects_list[source_object_index]["index"] = -1

def checkBusyStreams(self) :
for source_objects_list_item in self.source_objects_list :
- if source_objects_list_item[1] != -1 :
+ if source_objects_list_item["index"] != -1 :
return True
return False

def clearTabbedTranslateBrowser(self, source_object_index) :
-
self.tabbed_translate_browser.clear(self.source_objects_list[source_object_index][1])
+
self.tabbed_translate_browser.clear(self.source_objects_list[source_object_index]["index"])

def setTabbedTranslateBrowserCaption(self, source_object_index, word) :
-
self.tabbed_translate_browser.setCaption(self.source_objects_list[source_object_index][1],
word)
+
self.tabbed_translate_browser.setCaption(self.source_objects_list[source_object_index]["index"],
word)

def setTabbedTranslateBrowserText(self, source_object_index, text) :
-
self.tabbed_translate_browser.setText(self.source_objects_list[source_object_index][1],
text)
+
self.tabbed_translate_browser.setText(self.source_objects_list[source_object_index]["index"],
text)

def addTabbedTranslateBrowserTab(self) :
self.tabbed_translate_browser.addTab()
=======================================
--- /trunk/lightlang/apps/xsl/src/pyqt4/SlSearchPanel.py Wed Jan 20
14:12:57 2010
+++ /trunk/lightlang/apps/xsl/src/pyqt4/SlSearchPanel.py Sun Feb 21
15:04:44 2010
@@ -130,12 +130,27 @@
### Public ###

def requisites(self) :
- return [ Qt.QIcon(IconsDir+"xsl_16.png"), self.windowTitle(),
Qt.Qt.LeftDockWidgetArea, Qt.QKeySequence("Ctrl+S") ]
+ return {
+ "icon" : Qt.QIcon(IconsDir+"xsl_16.png"),
+ "title" : self.windowTitle(),
+ "area" : Qt.Qt.LeftDockWidgetArea,
+ "hotkey" : Qt.QKeySequence("Ctrl+S")
+ }

def translateMethods(self) :
return [
- [tr("SL usually search"), self.objectName(), "uFindTranslateMethod",
self.uFindTranslateMethod],
- [tr("SL expanded search"), self.objectName(), "cFindTranslateMethod",
self.cFindTranslateMethod]
+ {
+ "title" : tr("SL usually search"),
+ "object_name" : self.objectName(),
+ "method_name" : self.uFindTranslateMethod.__name__,
+ "method" : self.uFindTranslateMethod
+ },
+ {
+ "title" : tr("SL expanded search"),
+ "object_name" : self.objectName(),
+ "method_name" : self.cFindTranslateMethod.__name__,
+ "method" : self.cFindTranslateMethod
+ }
]

###