Skip to content

Commit c8f1bb9

Browse files
borysiastyborysiasty
committedJun 22, 2013
[Plugin Manager] If no Python support detected, display an explanation why there is nothing to install. Fixes #8063. PL translation included.
·
ltr-3_40archive/master_2
1 parent f7b1097 commit c8f1bb9

File tree

3 files changed

+655
-598
lines changed

3 files changed

+655
-598
lines changed
 

‎i18n/qgis_pl_PL.ts

Lines changed: 367 additions & 358 deletions
Large diffs are not rendered by default.

‎src/app/pluginmanager/qgspluginmanager.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ QgsPluginManager::QgsPluginManager( QWidget * parent, Qt::WFlags fl )
106106
buttonUpgradeAll->hide();
107107
buttonInstall->hide();
108108
buttonUninstall->hide();
109-
mOptionsListWidget->item( 5 )->setHidden( true );
109+
frameSettings->setHidden( true );
110110
}
111111

112112

@@ -133,7 +133,8 @@ void QgsPluginManager::setPythonUtils( QgsPythonUtils* pythonUtils )
133133
buttonUpgradeAll->show();
134134
buttonInstall->show();
135135
buttonUninstall->show();
136-
mOptionsListWidget->item( 5 )->setHidden( false );
136+
frameSettings->setHidden( false );
137+
labelNoPython->setHidden( true );
137138
buttonRefreshRepos->setEnabled( false );
138139
buttonEditRep->setEnabled( false );
139140
buttonDeleteRep->setEnabled( false );

‎src/ui/qgspluginmanagerbase.ui

Lines changed: 285 additions & 238 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>812</width>
10-
<height>507</height>
10+
<height>567</height>
1111
</rect>
1212
</property>
1313
<property name="minimumSize">
@@ -532,309 +532,355 @@
532532
</widget>
533533
</item>
534534
<item>
535-
<widget class="QGroupBox" name="ckbCheckUpdates">
536-
<property name="enabled">
537-
<bool>true</bool>
538-
</property>
535+
<widget class="QLabel" name="labelNoPython">
539536
<property name="sizePolicy">
540-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
537+
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
541538
<horstretch>0</horstretch>
542539
<verstretch>0</verstretch>
543540
</sizepolicy>
544541
</property>
545-
<property name="title">
546-
<string>Check for updates on startup</string>
547-
</property>
548-
<property name="checkable">
549-
<bool>true</bool>
550-
</property>
551-
<property name="checked">
552-
<bool>false</bool>
553-
</property>
554-
<layout class="QVBoxLayout" name="verticalLayout_3">
555-
<property name="leftMargin">
556-
<number>6</number>
557-
</property>
558-
<item>
559-
<widget class="QComboBox" name="comboInterval">
560-
<property name="sizePolicy">
561-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
562-
<horstretch>0</horstretch>
563-
<verstretch>0</verstretch>
564-
</sizepolicy>
565-
</property>
566-
<item>
567-
<property name="text">
568-
<string>every time QGIS starts</string>
569-
</property>
570-
</item>
571-
<item>
572-
<property name="text">
573-
<string>once a day</string>
574-
</property>
575-
</item>
576-
<item>
577-
<property name="text">
578-
<string>every 3 days</string>
579-
</property>
580-
</item>
581-
<item>
582-
<property name="text">
583-
<string>every week</string>
584-
</property>
585-
</item>
586-
<item>
587-
<property name="text">
588-
<string>every 2 weeks</string>
589-
</property>
590-
</item>
591-
<item>
592-
<property name="text">
593-
<string>every month</string>
594-
</property>
595-
</item>
596-
</widget>
597-
</item>
598-
<item>
599-
<widget class="QLabel" name="lblCheckUpdates">
600-
<property name="sizePolicy">
601-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
602-
<horstretch>0</horstretch>
603-
<verstretch>0</verstretch>
604-
</sizepolicy>
605-
</property>
606-
<property name="minimumSize">
607-
<size>
608-
<width>0</width>
609-
<height>0</height>
610-
</size>
611-
</property>
612-
<property name="text">
613-
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
614-
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
615-
p, li { white-space: pre-wrap; }
616-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
617-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; If this function is enabled, QGIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Manager window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
618-
</property>
619-
<property name="wordWrap">
620-
<bool>true</bool>
621-
</property>
622-
</widget>
623-
</item>
624-
</layout>
625-
</widget>
626-
</item>
627-
<item>
628-
<spacer name="verticalSpacer">
629-
<property name="orientation">
630-
<enum>Qt::Vertical</enum>
631-
</property>
632-
<property name="sizeType">
633-
<enum>QSizePolicy::Fixed</enum>
542+
<property name="text">
543+
<string>The settings on this tab are only applicable for Python Plugins. No Python support detected, thus no settings available.</string>
634544
</property>
635-
<property name="sizeHint" stdset="0">
636-
<size>
637-
<width>20</width>
638-
<height>10</height>
639-
</size>
545+
<property name="alignment">
546+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
640547
</property>
641-
</spacer>
642-
</item>
643-
<item>
644-
<widget class="QGroupBox" name="ckbExperimental">
645-
<property name="title">
646-
<string>Show also experimental plugins</string>
647-
</property>
648-
<property name="checkable">
548+
<property name="wordWrap">
649549
<bool>true</bool>
650550
</property>
651-
<property name="checked">
652-
<bool>false</bool>
551+
<property name="margin">
552+
<number>20</number>
653553
</property>
654-
<layout class="QVBoxLayout" name="verticalLayout_6">
655-
<item>
656-
<widget class="QLabel" name="lblExperimental">
657-
<property name="sizePolicy">
658-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
659-
<horstretch>0</horstretch>
660-
<verstretch>0</verstretch>
661-
</sizepolicy>
662-
</property>
663-
<property name="minimumSize">
664-
<size>
665-
<width>0</width>
666-
<height>0</height>
667-
</size>
668-
</property>
669-
<property name="text">
670-
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
671-
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
672-
p, li { white-space: pre-wrap; }
673-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
674-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; Experimental plugins are generally unsuitable for production use. These plugins are in early stages of development, and should be considered 'incomplete' or 'proof of concept' tools. QGIS does not recommend installing these plugins unless you intend to use them for testing purposes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
675-
</property>
676-
<property name="textFormat">
677-
<enum>Qt::RichText</enum>
678-
</property>
679-
<property name="alignment">
680-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
681-
</property>
682-
<property name="wordWrap">
683-
<bool>true</bool>
684-
</property>
685-
</widget>
686-
</item>
687-
</layout>
688-
</widget>
689-
</item>
690-
<item>
691-
<spacer name="verticalSpacer_2">
692-
<property name="orientation">
693-
<enum>Qt::Vertical</enum>
694-
</property>
695-
<property name="sizeType">
696-
<enum>QSizePolicy::Fixed</enum>
697-
</property>
698-
<property name="sizeHint" stdset="0">
699-
<size>
700-
<width>20</width>
701-
<height>10</height>
702-
</size>
703-
</property>
704-
</spacer>
705-
</item>
706-
<item>
707-
<widget class="QLabel" name="lblRepositories">
708-
<property name="text">
709-
<string>Plugin repositories</string>
710-
</property>
711-
<property name="buddy">
712-
<cstring>treeRepositories</cstring>
554+
<property name="indent">
555+
<number>0</number>
713556
</property>
714557
</widget>
715558
</item>
716559
<item>
717-
<widget class="QTreeWidget" name="treeRepositories">
560+
<widget class="QFrame" name="frameSettings">
718561
<property name="sizePolicy">
719562
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
720563
<horstretch>0</horstretch>
721564
<verstretch>0</verstretch>
722565
</sizepolicy>
723566
</property>
724-
<property name="minimumSize">
725-
<size>
726-
<width>0</width>
727-
<height>30</height>
728-
</size>
729-
</property>
730-
<property name="rootIsDecorated">
731-
<bool>false</bool>
732-
</property>
733-
<property name="itemsExpandable">
734-
<bool>false</bool>
735-
</property>
736-
<column>
737-
<property name="text">
738-
<string>Status</string>
739-
</property>
740-
</column>
741-
<column>
742-
<property name="text">
743-
<string>Name</string>
744-
</property>
745-
</column>
746-
<column>
747-
<property name="text">
748-
<string>URL</string>
749-
</property>
750-
</column>
751-
</widget>
752-
</item>
753-
<item>
754-
<widget class="QFrame" name="frameRepBut">
755-
<property name="sizePolicy">
756-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
757-
<horstretch>0</horstretch>
758-
<verstretch>0</verstretch>
759-
</sizepolicy>
760-
</property>
761567
<property name="frameShape">
762568
<enum>QFrame::NoFrame</enum>
763569
</property>
764570
<property name="frameShadow">
765571
<enum>QFrame::Raised</enum>
766572
</property>
767-
<layout class="QHBoxLayout" name="horizontalLayout_3">
573+
<layout class="QVBoxLayout" name="verticalLayout_10">
768574
<property name="margin">
769575
<number>0</number>
770576
</property>
771577
<item>
772-
<widget class="QPushButton" name="buttonRefreshRepos">
773-
<property name="toolTip">
774-
<string>Reload repository contents
775-
(useful when you uploaded a plugin there)</string>
578+
<widget class="QGroupBox" name="ckbCheckUpdates">
579+
<property name="enabled">
580+
<bool>true</bool>
776581
</property>
777-
<property name="text">
778-
<string>Reload repository</string>
582+
<property name="sizePolicy">
583+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
584+
<horstretch>0</horstretch>
585+
<verstretch>0</verstretch>
586+
</sizepolicy>
587+
</property>
588+
<property name="title">
589+
<string>Check for updates on startup</string>
590+
</property>
591+
<property name="checkable">
592+
<bool>true</bool>
779593
</property>
594+
<property name="checked">
595+
<bool>false</bool>
596+
</property>
597+
<layout class="QVBoxLayout" name="verticalLayout_3">
598+
<property name="leftMargin">
599+
<number>6</number>
600+
</property>
601+
<item>
602+
<widget class="QComboBox" name="comboInterval">
603+
<property name="sizePolicy">
604+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
605+
<horstretch>0</horstretch>
606+
<verstretch>0</verstretch>
607+
</sizepolicy>
608+
</property>
609+
<item>
610+
<property name="text">
611+
<string>every time QGIS starts</string>
612+
</property>
613+
</item>
614+
<item>
615+
<property name="text">
616+
<string>once a day</string>
617+
</property>
618+
</item>
619+
<item>
620+
<property name="text">
621+
<string>every 3 days</string>
622+
</property>
623+
</item>
624+
<item>
625+
<property name="text">
626+
<string>every week</string>
627+
</property>
628+
</item>
629+
<item>
630+
<property name="text">
631+
<string>every 2 weeks</string>
632+
</property>
633+
</item>
634+
<item>
635+
<property name="text">
636+
<string>every month</string>
637+
</property>
638+
</item>
639+
</widget>
640+
</item>
641+
<item>
642+
<widget class="QLabel" name="lblCheckUpdates">
643+
<property name="sizePolicy">
644+
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
645+
<horstretch>0</horstretch>
646+
<verstretch>0</verstretch>
647+
</sizepolicy>
648+
</property>
649+
<property name="minimumSize">
650+
<size>
651+
<width>0</width>
652+
<height>0</height>
653+
</size>
654+
</property>
655+
<property name="text">
656+
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
657+
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
658+
p, li { white-space: pre-wrap; }
659+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
660+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; If this function is enabled, QGIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Manager window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
661+
</property>
662+
<property name="wordWrap">
663+
<bool>true</bool>
664+
</property>
665+
</widget>
666+
</item>
667+
</layout>
780668
</widget>
781669
</item>
782670
<item>
783-
<spacer name="spacer_3">
671+
<spacer name="verticalSpacer">
784672
<property name="orientation">
785-
<enum>Qt::Horizontal</enum>
673+
<enum>Qt::Vertical</enum>
674+
</property>
675+
<property name="sizeType">
676+
<enum>QSizePolicy::Fixed</enum>
786677
</property>
787678
<property name="sizeHint" stdset="0">
788679
<size>
789-
<width>316</width>
680+
<width>20</width>
790681
<height>10</height>
791682
</size>
792683
</property>
793684
</spacer>
794685
</item>
795686
<item>
796-
<widget class="QPushButton" name="buttonAddRep">
797-
<property name="toolTip">
798-
<string>Configure an additional plugin repository</string>
687+
<widget class="QGroupBox" name="ckbExperimental">
688+
<property name="title">
689+
<string>Show also experimental plugins</string>
799690
</property>
800-
<property name="whatsThis">
801-
<string>Add a new plugin repository</string>
691+
<property name="checkable">
692+
<bool>true</bool>
693+
</property>
694+
<property name="checked">
695+
<bool>false</bool>
802696
</property>
697+
<layout class="QVBoxLayout" name="verticalLayout_6">
698+
<item>
699+
<widget class="QLabel" name="lblExperimental">
700+
<property name="sizePolicy">
701+
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
702+
<horstretch>0</horstretch>
703+
<verstretch>0</verstretch>
704+
</sizepolicy>
705+
</property>
706+
<property name="minimumSize">
707+
<size>
708+
<width>0</width>
709+
<height>0</height>
710+
</size>
711+
</property>
712+
<property name="text">
713+
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
714+
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
715+
p, li { white-space: pre-wrap; }
716+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
717+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; Experimental plugins are generally unsuitable for production use. These plugins are in early stages of development, and should be considered 'incomplete' or 'proof of concept' tools. QGIS does not recommend installing these plugins unless you intend to use them for testing purposes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
718+
</property>
719+
<property name="textFormat">
720+
<enum>Qt::RichText</enum>
721+
</property>
722+
<property name="alignment">
723+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
724+
</property>
725+
<property name="wordWrap">
726+
<bool>true</bool>
727+
</property>
728+
</widget>
729+
</item>
730+
</layout>
731+
</widget>
732+
</item>
733+
<item>
734+
<spacer name="verticalSpacer_2">
735+
<property name="orientation">
736+
<enum>Qt::Vertical</enum>
737+
</property>
738+
<property name="sizeType">
739+
<enum>QSizePolicy::Fixed</enum>
740+
</property>
741+
<property name="sizeHint" stdset="0">
742+
<size>
743+
<width>20</width>
744+
<height>10</height>
745+
</size>
746+
</property>
747+
</spacer>
748+
</item>
749+
<item>
750+
<widget class="QLabel" name="lblRepositories">
803751
<property name="text">
804-
<string>Add...</string>
752+
<string>Plugin repositories</string>
753+
</property>
754+
<property name="buddy">
755+
<cstring>treeRepositories</cstring>
805756
</property>
806757
</widget>
807758
</item>
808759
<item>
809-
<widget class="QPushButton" name="buttonEditRep">
760+
<widget class="QTreeWidget" name="treeRepositories">
810761
<property name="sizePolicy">
811-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
762+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
812763
<horstretch>0</horstretch>
813764
<verstretch>0</verstretch>
814765
</sizepolicy>
815766
</property>
816-
<property name="toolTip">
817-
<string>Edit the selected repository</string>
767+
<property name="minimumSize">
768+
<size>
769+
<width>0</width>
770+
<height>30</height>
771+
</size>
818772
</property>
819-
<property name="whatsThis">
820-
<string>Edit the selected repository</string>
773+
<property name="rootIsDecorated">
774+
<bool>false</bool>
821775
</property>
822-
<property name="text">
823-
<string>Edit...</string>
776+
<property name="itemsExpandable">
777+
<bool>false</bool>
824778
</property>
779+
<column>
780+
<property name="text">
781+
<string>Status</string>
782+
</property>
783+
</column>
784+
<column>
785+
<property name="text">
786+
<string>Name</string>
787+
</property>
788+
</column>
789+
<column>
790+
<property name="text">
791+
<string>URL</string>
792+
</property>
793+
</column>
825794
</widget>
826795
</item>
827796
<item>
828-
<widget class="QPushButton" name="buttonDeleteRep">
829-
<property name="toolTip">
830-
<string>Remove the selected repository</string>
797+
<widget class="QFrame" name="frameRepBut">
798+
<property name="sizePolicy">
799+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
800+
<horstretch>0</horstretch>
801+
<verstretch>0</verstretch>
802+
</sizepolicy>
831803
</property>
832-
<property name="whatsThis">
833-
<string>Remove the selected repository</string>
804+
<property name="frameShape">
805+
<enum>QFrame::NoFrame</enum>
834806
</property>
835-
<property name="text">
836-
<string>Delete</string>
807+
<property name="frameShadow">
808+
<enum>QFrame::Raised</enum>
837809
</property>
810+
<layout class="QHBoxLayout" name="horizontalLayout_3">
811+
<property name="margin">
812+
<number>0</number>
813+
</property>
814+
<item>
815+
<widget class="QPushButton" name="buttonRefreshRepos">
816+
<property name="toolTip">
817+
<string>Reload repository contents
818+
(useful when you uploaded a plugin there)</string>
819+
</property>
820+
<property name="text">
821+
<string>Reload repository</string>
822+
</property>
823+
</widget>
824+
</item>
825+
<item>
826+
<spacer name="spacer_3">
827+
<property name="orientation">
828+
<enum>Qt::Horizontal</enum>
829+
</property>
830+
<property name="sizeHint" stdset="0">
831+
<size>
832+
<width>316</width>
833+
<height>10</height>
834+
</size>
835+
</property>
836+
</spacer>
837+
</item>
838+
<item>
839+
<widget class="QPushButton" name="buttonAddRep">
840+
<property name="toolTip">
841+
<string>Configure an additional plugin repository</string>
842+
</property>
843+
<property name="whatsThis">
844+
<string>Add a new plugin repository</string>
845+
</property>
846+
<property name="text">
847+
<string>Add...</string>
848+
</property>
849+
</widget>
850+
</item>
851+
<item>
852+
<widget class="QPushButton" name="buttonEditRep">
853+
<property name="sizePolicy">
854+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
855+
<horstretch>0</horstretch>
856+
<verstretch>0</verstretch>
857+
</sizepolicy>
858+
</property>
859+
<property name="toolTip">
860+
<string>Edit the selected repository</string>
861+
</property>
862+
<property name="whatsThis">
863+
<string>Edit the selected repository</string>
864+
</property>
865+
<property name="text">
866+
<string>Edit...</string>
867+
</property>
868+
</widget>
869+
</item>
870+
<item>
871+
<widget class="QPushButton" name="buttonDeleteRep">
872+
<property name="toolTip">
873+
<string>Remove the selected repository</string>
874+
</property>
875+
<property name="whatsThis">
876+
<string>Remove the selected repository</string>
877+
</property>
878+
<property name="text">
879+
<string>Delete</string>
880+
</property>
881+
</widget>
882+
</item>
883+
</layout>
838884
</widget>
839885
</item>
840886
</layout>
@@ -885,6 +931,7 @@ p, li { white-space: pre-wrap; }
885931
<tabstop>buttonAddRep</tabstop>
886932
<tabstop>buttonEditRep</tabstop>
887933
<tabstop>buttonDeleteRep</tabstop>
934+
<tabstop>buttonBox</tabstop>
888935
</tabstops>
889936
<resources>
890937
<include location="../../images/images.qrc"/>

0 commit comments

Comments
 (0)
Please sign in to comment.