Remove various bits of special processing when compiling .ui forms

This commit is contained in:
Kovid Goyal 2014-04-11 11:16:36 +05:30
parent e7d0846f46
commit d38297878e
19 changed files with 21 additions and 26 deletions

View File

@ -1138,12 +1138,7 @@ def build_forms(srcdir, info=None):
buf = cStringIO.StringIO() buf = cStringIO.StringIO()
compileUi(form, buf) compileUi(form, buf)
dat = buf.getvalue() dat = buf.getvalue()
dat = dat.replace('__appname__', 'calibre')
dat = dat.replace('import images_rc', '') dat = dat.replace('import images_rc', '')
dat = dat.replace('from library import', 'from calibre.gui2.library import')
dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
dat = dat.replace('from convert.xpath_wizard import',
'from calibre.gui2.convert.xpath_wizard import')
dat = re.sub(r'^ {4}def _translate\(context, text, disambig\):\s+return.*$', ' pass', dat, dat = re.sub(r'^ {4}def _translate\(context, text, disambig\):\s+return.*$', ' pass', dat,
flags=re.M) flags=re.M)
dat = re.compile(r'(?:QtGui.QApplication.translate|(?<!def )_translate)\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat) dat = re.compile(r'(?:QtGui.QApplication.translate|(?<!def )_translate)\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)

View File

@ -435,7 +435,7 @@
<customwidget> <customwidget>
<class>EncodingComboBox</class> <class>EncodingComboBox</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>FontFamilyChooser</class> <class>FontFamilyChooser</class>

View File

@ -274,7 +274,7 @@
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>EditWithComplete</class> <class>EditWithComplete</class>

View File

@ -67,7 +67,7 @@
<customwidget> <customwidget>
<class>EncodingComboBox</class> <class>EncodingComboBox</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

View File

@ -65,7 +65,7 @@
<customwidget> <customwidget>
<class>EncodingComboBox</class> <class>EncodingComboBox</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

View File

@ -103,7 +103,7 @@
<customwidget> <customwidget>
<class>XPathEdit</class> <class>XPathEdit</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>convert/xpath_wizard.h</header> <header>calibre/gui2/convert/xpath_wizard.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

View File

@ -135,7 +135,7 @@
<customwidget> <customwidget>
<class>XPathEdit</class> <class>XPathEdit</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>convert/xpath_wizard.h</header> <header>calibre/gui2/convert/xpath_wizard.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

View File

@ -138,7 +138,7 @@
<customwidget> <customwidget>
<class>EncodingComboBox</class> <class>EncodingComboBox</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

View File

@ -159,7 +159,7 @@
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>

View File

@ -1247,7 +1247,7 @@ is completed. This can be slow on large libraries.</string>
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>EditWithComplete</class> <class>EditWithComplete</class>
@ -1257,7 +1257,7 @@ is completed. This can be slow on large libraries.</string>
<customwidget> <customwidget>
<class>HistoryLineEdit</class> <class>HistoryLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>LanguagesEdit</class> <class>LanguagesEdit</class>

View File

@ -326,7 +326,7 @@
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>EditWithComplete</class> <class>EditWithComplete</class>

View File

@ -262,7 +262,7 @@
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>

View File

@ -118,7 +118,7 @@
<customwidget> <customwidget>
<class>HistoryLineEdit</class> <class>HistoryLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

View File

@ -402,7 +402,7 @@ p, li { white-space: pre-wrap; }
<item> <item>
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>For help with writing advanced news recipes, please visit &lt;a href=&quot;http://manual.__appname__-ebook.com/news.html&quot;&gt;User Recipes&lt;/a&gt;</string> <string>For help with writing advanced news recipes, please visit &lt;a href=&quot;http://manual.calibre-ebook.com/news.html&quot;&gt;User Recipes&lt;/a&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -467,12 +467,12 @@ p, li { white-space: pre-wrap; }
<customwidget> <customwidget>
<class>BasicList</class> <class>BasicList</class>
<extends>QListWidget</extends> <extends>QListWidget</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>

View File

@ -384,7 +384,7 @@
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

View File

@ -136,7 +136,7 @@
<customwidget> <customwidget>
<class>HistoryLineEdit</class> <class>HistoryLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

View File

@ -384,7 +384,7 @@
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

View File

@ -293,7 +293,7 @@
<customwidget> <customwidget>
<class>EnLineEdit</class> <class>EnLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

View File

@ -118,7 +118,7 @@
<customwidget> <customwidget>
<class>HistoryLineEdit</class> <class>HistoryLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>widgets.h</header> <header>calibre/gui2/widgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>