Skip to content

Commit c170110

Browse files
author
borysiasty
committed
Plugin Instaler update: add translateable strings for future switch to the central contributed repository
git-svn-id: http://svn.osgeo.org/qgis/trunk@13770 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bef7e50 commit c170110

File tree

3 files changed

+184
-5
lines changed

3 files changed

+184
-5
lines changed

‎python/plugins/plugin_installer/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ PYQT4_WRAP_UI(PYUI_FILES
1818
qgsplugininstallerinstallingbase.ui
1919
qgsplugininstallerpluginerrorbase.ui
2020
qgsplugininstallerrepositorybase.ui
21+
qgsplugininstalleroldreposbase.ui
2122
)
2223

2324
PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)

‎python/plugins/plugin_installer/qgsplugininstallerbase.ui

+63-5
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
<string>List of plugin repositories</string>
304304
</attribute>
305305
<layout class="QGridLayout">
306-
<item row="0" column="0" colspan="7">
306+
<item row="0" column="0" colspan="9">
307307
<widget class="QTreeWidget" name="treeRepositories">
308308
<property name="rootIsDecorated">
309309
<bool>false</bool>
@@ -360,7 +360,7 @@
360360
</property>
361361
</widget>
362362
</item>
363-
<item row="1" column="3">
363+
<item row="1" column="5">
364364
<spacer>
365365
<property name="orientation">
366366
<enum>Qt::Horizontal</enum>
@@ -373,7 +373,7 @@
373373
</property>
374374
</spacer>
375375
</item>
376-
<item row="1" column="4">
376+
<item row="1" column="6">
377377
<widget class="QPushButton" name="buttonAddRep">
378378
<property name="toolTip">
379379
<string>Add a new plugin repository</string>
@@ -386,7 +386,7 @@
386386
</property>
387387
</widget>
388388
</item>
389-
<item row="1" column="5">
389+
<item row="1" column="7">
390390
<widget class="QPushButton" name="buttonEditRep">
391391
<property name="toolTip">
392392
<string>Edit the selected repository</string>
@@ -399,7 +399,7 @@
399399
</property>
400400
</widget>
401401
</item>
402-
<item row="1" column="6">
402+
<item row="1" column="8">
403403
<widget class="QPushButton" name="buttonDeleteRep">
404404
<property name="toolTip">
405405
<string>Remove the selected repository</string>
@@ -412,6 +412,62 @@
412412
</property>
413413
</widget>
414414
</item>
415+
<item row="1" column="3">
416+
<widget class="QPushButton" name="buttonAddContributedRepository">
417+
<property name="sizePolicy">
418+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
419+
<horstretch>0</horstretch>
420+
<verstretch>0</verstretch>
421+
</sizepolicy>
422+
</property>
423+
<property name="minimumSize">
424+
<size>
425+
<width>0</width>
426+
<height>0</height>
427+
</size>
428+
</property>
429+
<property name="maximumSize">
430+
<size>
431+
<width>0</width>
432+
<height>16777215</height>
433+
</size>
434+
</property>
435+
<property name="toolTip">
436+
<string>Add the contributed repository to the list</string>
437+
</property>
438+
<property name="whatsThis">
439+
<string>Add the contributed repository to the list</string>
440+
</property>
441+
<property name="text">
442+
<string>Add the contributed repository</string>
443+
</property>
444+
</widget>
445+
</item>
446+
<item row="1" column="4">
447+
<widget class="QPushButton" name="buttonDeleteDepreciatedRepos">
448+
<property name="sizePolicy">
449+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
450+
<horstretch>0</horstretch>
451+
<verstretch>0</verstretch>
452+
</sizepolicy>
453+
</property>
454+
<property name="maximumSize">
455+
<size>
456+
<width>0</width>
457+
<height>16777215</height>
458+
</size>
459+
</property>
460+
<property name="toolTip">
461+
<string>Remove depreciated repositories from the list</string>
462+
</property>
463+
<property name="whatsThis">
464+
<string>Remove depreciated repositories from the list</string>
465+
</property>
466+
<property name="text">
467+
<string>Delete depreciated repositories</string>
468+
</property>
469+
</widget>
470+
</item>
415471
</layout>
416472
</widget>
417473
<widget class="QWidget" name="tab_3">
@@ -617,6 +673,8 @@ p, li { white-space: pre-wrap; }
617673
<tabstop>buttonHelp</tabstop>
618674
<tabstop>treeRepositories</tabstop>
619675
<tabstop>buttonFetchRepositories</tabstop>
676+
<tabstop>buttonAddContributedRepository</tabstop>
677+
<tabstop>buttonDeleteDepreciatedRepos</tabstop>
620678
<tabstop>buttonAddRep</tabstop>
621679
<tabstop>buttonEditRep</tabstop>
622680
<tabstop>buttonDeleteRep</tabstop>

‎python/plugins/plugin_installer/qgsplugininstalleroldreposbase.ui

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<author>Borys Jurgiel</author>
4+
<class>QgsPluginInstallerOldReposBase</class>
5+
<widget class="QDialog" name="QgsPluginInstallerOldReposBase">
6+
<property name="geometry">
7+
<rect>
8+
<x>0</x>
9+
<y>0</y>
10+
<width>601</width>
11+
<height>182</height>
12+
</rect>
13+
</property>
14+
<property name="minimumSize">
15+
<size>
16+
<width>480</width>
17+
<height>150</height>
18+
</size>
19+
</property>
20+
<property name="windowTitle">
21+
<string>Plugin Installer</string>
22+
</property>
23+
<property name="windowIcon">
24+
<iconset resource="resources.qrc">
25+
<normaloff>:/plugins/installer/qgis-icon.png</normaloff>:/plugins/installer/qgis-icon.png</iconset>
26+
</property>
27+
<layout class="QGridLayout" name="gridLayout">
28+
<item row="0" column="1">
29+
<widget class="QLabel" name="label">
30+
<property name="sizePolicy">
31+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
32+
<horstretch>0</horstretch>
33+
<verstretch>0</verstretch>
34+
</sizepolicy>
35+
</property>
36+
<property name="text">
37+
<string>The Plugin Installer has detected that your copy of QGIS is configured to use a number of plugin repositories around the world. It was a typical situation in older versions of the program, but from the version 1.5, external plugins are collected in one central Contributed Repository, and all the old repositories are not necessary any more. Do you want to drop them now? If you're unsure what to do, probably you don't need them. However, if you choose to keep them in use, you will be able to remove them manually later.</string>
38+
</property>
39+
<property name="wordWrap">
40+
<bool>true</bool>
41+
</property>
42+
<property name="openExternalLinks">
43+
<bool>true</bool>
44+
</property>
45+
</widget>
46+
</item>
47+
<item row="1" column="1" colspan="2">
48+
<layout class="QHBoxLayout" name="horizontalLayout">
49+
<item>
50+
<widget class="QPushButton" name="butOldReposRemove">
51+
<property name="text">
52+
<string>Remove</string>
53+
</property>
54+
</widget>
55+
</item>
56+
<item>
57+
<widget class="QPushButton" name="butOldReposDisable">
58+
<property name="text">
59+
<string>Disable</string>
60+
</property>
61+
</widget>
62+
</item>
63+
<item>
64+
<widget class="QPushButton" name="butOldReposKeep">
65+
<property name="text">
66+
<string>Keep</string>
67+
</property>
68+
</widget>
69+
</item>
70+
<item>
71+
<widget class="QPushButton" name="butOldReposAsk">
72+
<property name="text">
73+
<string>Ask me later</string>
74+
</property>
75+
<property name="default">
76+
<bool>true</bool>
77+
</property>
78+
</widget>
79+
</item>
80+
</layout>
81+
</item>
82+
<item row="0" column="3">
83+
<spacer name="horizontalSpacer_2">
84+
<property name="orientation">
85+
<enum>Qt::Horizontal</enum>
86+
</property>
87+
<property name="sizeType">
88+
<enum>QSizePolicy::Fixed</enum>
89+
</property>
90+
<property name="sizeHint" stdset="0">
91+
<size>
92+
<width>20</width>
93+
<height>20</height>
94+
</size>
95+
</property>
96+
</spacer>
97+
</item>
98+
<item row="0" column="0">
99+
<spacer name="horizontalSpacer">
100+
<property name="orientation">
101+
<enum>Qt::Horizontal</enum>
102+
</property>
103+
<property name="sizeType">
104+
<enum>QSizePolicy::Fixed</enum>
105+
</property>
106+
<property name="sizeHint" stdset="0">
107+
<size>
108+
<width>20</width>
109+
<height>20</height>
110+
</size>
111+
</property>
112+
</spacer>
113+
</item>
114+
</layout>
115+
</widget>
116+
<resources>
117+
<include location="resources.qrc"/>
118+
</resources>
119+
<connections/>
120+
</ui>

0 commit comments

Comments
 (0)