[QGIS Commit] r13770 - trunk/qgis/python/plugins/plugin_installer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Jun 21 17:50:23 EDT 2010
Author: borysiasty
Date: 2010-06-21 21:50:22 +0000 (Mon, 21 Jun 2010)
New Revision: 13770
Added:
trunk/qgis/python/plugins/plugin_installer/qgsplugininstalleroldreposbase.ui
Modified:
trunk/qgis/python/plugins/plugin_installer/CMakeLists.txt
trunk/qgis/python/plugins/plugin_installer/qgsplugininstallerbase.ui
Log:
Plugin Instaler update: add translateable strings for future switch to the central contributed repository
Modified: trunk/qgis/python/plugins/plugin_installer/CMakeLists.txt
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/CMakeLists.txt 2010-06-21 17:47:04 UTC (rev 13769)
+++ trunk/qgis/python/plugins/plugin_installer/CMakeLists.txt 2010-06-21 21:50:22 UTC (rev 13770)
@@ -18,6 +18,7 @@
qgsplugininstallerinstallingbase.ui
qgsplugininstallerpluginerrorbase.ui
qgsplugininstallerrepositorybase.ui
+ qgsplugininstalleroldreposbase.ui
)
PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
Modified: trunk/qgis/python/plugins/plugin_installer/qgsplugininstallerbase.ui
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/qgsplugininstallerbase.ui 2010-06-21 17:47:04 UTC (rev 13769)
+++ trunk/qgis/python/plugins/plugin_installer/qgsplugininstallerbase.ui 2010-06-21 21:50:22 UTC (rev 13770)
@@ -303,7 +303,7 @@
<string>List of plugin repositories</string>
</attribute>
<layout class="QGridLayout">
- <item row="0" column="0" colspan="7">
+ <item row="0" column="0" colspan="9">
<widget class="QTreeWidget" name="treeRepositories">
<property name="rootIsDecorated">
<bool>false</bool>
@@ -360,7 +360,7 @@
</property>
</widget>
</item>
- <item row="1" column="3">
+ <item row="1" column="5">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -373,7 +373,7 @@
</property>
</spacer>
</item>
- <item row="1" column="4">
+ <item row="1" column="6">
<widget class="QPushButton" name="buttonAddRep">
<property name="toolTip">
<string>Add a new plugin repository</string>
@@ -386,7 +386,7 @@
</property>
</widget>
</item>
- <item row="1" column="5">
+ <item row="1" column="7">
<widget class="QPushButton" name="buttonEditRep">
<property name="toolTip">
<string>Edit the selected repository</string>
@@ -399,7 +399,7 @@
</property>
</widget>
</item>
- <item row="1" column="6">
+ <item row="1" column="8">
<widget class="QPushButton" name="buttonDeleteRep">
<property name="toolTip">
<string>Remove the selected repository</string>
@@ -412,6 +412,62 @@
</property>
</widget>
</item>
+ <item row="1" column="3">
+ <widget class="QPushButton" name="buttonAddContributedRepository">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>0</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Add the contributed repository to the list</string>
+ </property>
+ <property name="whatsThis">
+ <string>Add the contributed repository to the list</string>
+ </property>
+ <property name="text">
+ <string>Add the contributed repository</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4">
+ <widget class="QPushButton" name="buttonDeleteDepreciatedRepos">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>0</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Remove depreciated repositories from the list</string>
+ </property>
+ <property name="whatsThis">
+ <string>Remove depreciated repositories from the list</string>
+ </property>
+ <property name="text">
+ <string>Delete depreciated repositories</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
@@ -617,6 +673,8 @@
<tabstop>buttonHelp</tabstop>
<tabstop>treeRepositories</tabstop>
<tabstop>buttonFetchRepositories</tabstop>
+ <tabstop>buttonAddContributedRepository</tabstop>
+ <tabstop>buttonDeleteDepreciatedRepos</tabstop>
<tabstop>buttonAddRep</tabstop>
<tabstop>buttonEditRep</tabstop>
<tabstop>buttonDeleteRep</tabstop>
Added: trunk/qgis/python/plugins/plugin_installer/qgsplugininstalleroldreposbase.ui
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/qgsplugininstalleroldreposbase.ui (rev 0)
+++ trunk/qgis/python/plugins/plugin_installer/qgsplugininstalleroldreposbase.ui 2010-06-21 21:50:22 UTC (rev 13770)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Borys Jurgiel</author>
+ <class>QgsPluginInstallerOldReposBase</class>
+ <widget class="QDialog" name="QgsPluginInstallerOldReposBase">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>601</width>
+ <height>182</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>480</width>
+ <height>150</height>
+ </size>
+ </property>
+ <property name="windowTitle">
+ <string>Plugin Installer</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/plugins/installer/qgis-icon.png</normaloff>:/plugins/installer/qgis-icon.png</iconset>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="1">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <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>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="butOldReposRemove">
+ <property name="text">
+ <string>Remove</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="butOldReposDisable">
+ <property name="text">
+ <string>Disable</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="butOldReposKeep">
+ <property name="text">
+ <string>Keep</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="butOldReposAsk">
+ <property name="text">
+ <string>Ask me later</string>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="3">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
More information about the QGIS-commit
mailing list