bug_1422_fix.diff

cfarmer -, 2008-11-24 02:15 AM

Download (17.1 KB)

View differences:

python/plugins/plugin_installer/installer_data.py (working copy)
84 84 
    settings.beginGroup("proxy")
85 85 
    if settings.value("/proxyEnabled").toBool():
86 86 
      self.proxy=QNetworkProxy()
87 
      self.proxy.setType(QNetworkProxy.HttpProxy)
87 
      if settings.value( "/proxyType").toInt()[0] == 1:
88 
      	self.proxy.setType( QNetworkProxy.Socks5Proxy )
89 
      else:
90 
      	self.proxy.setType( QNetworkProxy.HttpProxy )
88 91 
      self.proxy.setHostName(settings.value("/proxyHost").toString())
89 92 
      self.proxy.setPort(settings.value("/proxyPort").toUInt()[0])
90 93 
      self.proxy.setUser(settings.value("/proxyUser").toString())
src/ui/qgsoptionsbase.ui (working copy)
6 6 
    <x>0</x>
7 7 
    <y>0</y>
8 8 
    <width>617</width>
9 
    <height>559</height>
9 
    <height>546</height>
10 10 
   </rect>
11 11 
  </property>
12 12 
  <property name="windowTitle" >
13 13 
   <string>QGIS Options</string>
14 14 
  </property>
15 15 
  <property name="windowIcon" >
16 
   <iconset/>
16 
   <iconset>
17 
    <normaloff>../dev/cpp/qgis/src/ui</normaloff>../dev/cpp/qgis/src/ui</iconset>
17 18 
  </property>
18 19 
  <property name="sizeGripEnabled" >
19 20 
   <bool>true</bool>
......
25 26 
   <item row="0" column="0" >
26 27 
    <widget class="QTabWidget" name="tabWidget" >
27 28 
     <property name="currentIndex" >
28 
      <number>0</number>
29 
      <number>6</number>
29 30 
     </property>
30 31 
     <widget class="QWidget" name="tabGeneral" >
32 
      <property name="geometry" >
33 
       <rect>
34 
        <x>0</x>
35 
        <y>0</y>
36 
        <width>595</width>
37 
        <height>462</height>
38 
       </rect>
39 
      </property>
31 40 
      <attribute name="title" >
32 41 
       <string>&amp;General</string>
33 42 
      </attribute>
......
38 47 
          <string>Project files</string>
39 48 
         </property>
40 49 
         <layout class="QVBoxLayout" >
41 
          <property name="leftMargin" >
50 
          <property name="margin" >
42 51 
           <number>11</number>
43 52 
          </property>
44 
          <property name="topMargin" >
45 
           <number>11</number>
46 
          </property>
47 
          <property name="rightMargin" >
48 
           <number>11</number>
49 
          </property>
50 
          <property name="bottomMargin" >
51 
           <number>11</number>
52 
          </property>
53 53 
          <item>
54 54 
           <widget class="QCheckBox" name="chbAskToSaveProjectChanges" >
55 55 
            <property name="text" >
......
88 88 
            <property name="orientation" >
89 89 
             <enum>Qt::Horizontal</enum>
90 90 
            </property>
91 
            <property name="sizeHint" >
91 
            <property name="sizeHint" stdset="0" >
92 92 
             <size>
93 93 
              <width>40</width>
94 94 
              <height>20</height>
......
124 124 
            <property name="orientation" >
125 125 
             <enum>Qt::Horizontal</enum>
126 126 
            </property>
127 
            <property name="sizeHint" >
127 
            <property name="sizeHint" stdset="0" >
128 128 
             <size>
129 129 
              <width>40</width>
130 130 
              <height>20</height>
......
228 228 
         <property name="orientation" >
229 229 
          <enum>Qt::Vertical</enum>
230 230 
         </property>
231 
         <property name="sizeHint" >
231 
         <property name="sizeHint" stdset="0" >
232 232 
          <size>
233 233 
           <width>577</width>
234 234 
           <height>21</height>
......
239 239 
      </layout>
240 240 
     </widget>
241 241 
     <widget class="QWidget" name="tabRendering" >
242 
      <property name="geometry" >
243 
       <rect>
244 
        <x>0</x>
245 
        <y>0</y>
246 
        <width>595</width>
247 
        <height>462</height>
248 
       </rect>
249 
      </property>
242 250 
      <attribute name="title" >
243 251 
       <string>&amp;Rendering</string>
244 252 
      </attribute>
......
295 303 
          <string>Rendering quality</string>
296 304 
         </property>
297 305 
         <layout class="QVBoxLayout" >
298 
          <property name="leftMargin" >
306 
          <property name="margin" >
299 307 
           <number>11</number>
300 308 
          </property>
301 
          <property name="topMargin" >
302 
           <number>11</number>
303 
          </property>
304 
          <property name="rightMargin" >
305 
           <number>11</number>
306 
          </property>
307 
          <property name="bottomMargin" >
308 
           <number>11</number>
309 
          </property>
310 309 
          <item>
311 310 
           <widget class="QCheckBox" name="chkAntiAliasing" >
312 311 
            <property name="text" >
......
339 338 
         <property name="orientation" >
340 339 
          <enum>Qt::Vertical</enum>
341 340 
         </property>
342 
         <property name="sizeHint" >
341 
         <property name="sizeHint" stdset="0" >
343 342 
          <size>
344 343 
           <width>20</width>
345 344 
           <height>40</height>
......
350 349 
      </layout>
351 350 
     </widget>
352 351 
     <widget class="QWidget" name="tabMap" >
352 
      <property name="geometry" >
353 
       <rect>
354 
        <x>0</x>
355 
        <y>0</y>
356 
        <width>595</width>
357 
        <height>462</height>
358 
       </rect>
359 
      </property>
353 360 
      <attribute name="title" >
354 361 
       <string>&amp;Map tools</string>
355 362 
      </attribute>
356 363 
      <layout class="QGridLayout" >
357 
       <property name="leftMargin" >
364 
       <property name="margin" >
358 365 
        <number>11</number>
359 366 
       </property>
360 
       <property name="topMargin" >
361 
        <number>11</number>
362 
       </property>
363 
       <property name="rightMargin" >
364 
        <number>11</number>
365 
       </property>
366 
       <property name="bottomMargin" >
367 
        <number>11</number>
368 
       </property>
369 367 
       <item row="2" column="0" >
370 368 
        <widget class="QGroupBox" name="groupBox_10" >
371 369 
         <property name="title" >
372 370 
          <string>Panning and zooming</string>
373 371 
         </property>
374 372 
         <layout class="QGridLayout" >
375 
          <property name="leftMargin" >
373 
          <property name="margin" >
376 374 
           <number>11</number>
377 375 
          </property>
378 
          <property name="topMargin" >
379 
           <number>11</number>
380 
          </property>
381 
          <property name="rightMargin" >
382 
           <number>11</number>
383 
          </property>
384 
          <property name="bottomMargin" >
385 
           <number>11</number>
386 
          </property>
387 376 
          <item row="0" column="1" >
388 377 
           <widget class="QComboBox" name="cmbWheelAction" >
389 378 
            <item>
......
444 433 
          <string>Measure tool</string>
445 434 
         </property>
446 435 
         <layout class="QGridLayout" >
447 
          <property name="leftMargin" >
436 
          <property name="margin" >
448 437 
           <number>11</number>
449 438 
          </property>
450 
          <property name="topMargin" >
451 
           <number>11</number>
452 
          </property>
453 
          <property name="rightMargin" >
454 
           <number>11</number>
455 
          </property>
456 
          <property name="bottomMargin" >
457 
           <number>11</number>
458 
          </property>
459 439 
          <item row="1" column="2" >
460 440 
           <spacer>
461 441 
            <property name="orientation" >
462 442 
             <enum>Qt::Horizontal</enum>
463 443 
            </property>
464 
            <property name="sizeHint" >
444 
            <property name="sizeHint" stdset="0" >
465 445 
             <size>
466 446 
              <width>191</width>
467 447 
              <height>20</height>
......
514 494 
          <string>Search radius</string>
515 495 
         </property>
516 496 
         <layout class="QGridLayout" >
517 
          <property name="leftMargin" >
497 
          <property name="margin" >
518 498 
           <number>11</number>
519 499 
          </property>
520 
          <property name="topMargin" >
521 
           <number>11</number>
522 
          </property>
523 
          <property name="rightMargin" >
524 
           <number>11</number>
525 
          </property>
526 
          <property name="bottomMargin" >
527 
           <number>11</number>
528 
          </property>
529 500 
          <item row="1" column="0" colspan="2" >
530 501 
           <widget class="QLabel" name="textLabel2" >
531 502 
            <property name="text" >
......
570 541 
         <property name="orientation" >
571 542 
          <enum>Qt::Vertical</enum>
572 543 
         </property>
573 
         <property name="sizeHint" >
544 
         <property name="sizeHint" stdset="0" >
574 545 
          <size>
575 546 
           <width>20</width>
576 547 
           <height>40</height>
......
581 552 
      </layout>
582 553 
     </widget>
583 554 
     <widget class="QWidget" name="tabDigitizing" >
555 
      <property name="geometry" >
556 
       <rect>
557 
        <x>0</x>
558 
        <y>0</y>
559 
        <width>595</width>
560 
        <height>462</height>
561 
       </rect>
562 
      </property>
584 563 
      <attribute name="title" >
585 564 
       <string>Digitizing</string>
586 565 
      </attribute>
......
655 634 
            <property name="orientation" >
656 635 
             <enum>Qt::Horizontal</enum>
657 636 
            </property>
658 
            <property name="sizeHint" >
637 
            <property name="sizeHint" stdset="0" >
659 638 
             <size>
660 639 
              <width>311</width>
661 640 
              <height>20</height>
......
685 664 
            <property name="orientation" >
686 665 
             <enum>Qt::Horizontal</enum>
687 666 
            </property>
688 
            <property name="sizeHint" >
667 
            <property name="sizeHint" stdset="0" >
689 668 
             <size>
690 669 
              <width>241</width>
691 670 
              <height>20</height>
......
715 694 
            <property name="orientation" >
716 695 
             <enum>Qt::Horizontal</enum>
717 696 
            </property>
718 
            <property name="sizeHint" >
697 
            <property name="sizeHint" stdset="0" >
719 698 
             <size>
720 699 
              <width>61</width>
721 700 
              <height>20</height>
......
754 733 
            <property name="orientation" >
755 734 
             <enum>Qt::Horizontal</enum>
756 735 
            </property>
757 
            <property name="sizeHint" >
736 
            <property name="sizeHint" stdset="0" >
758 737 
             <size>
759 738 
              <width>281</width>
760 739 
              <height>20</height>
......
780 759 
         <property name="orientation" >
781 760 
          <enum>Qt::Vertical</enum>
782 761 
         </property>
783 
         <property name="sizeHint" >
762 
         <property name="sizeHint" stdset="0" >
784 763 
          <size>
785 764 
           <width>547</width>
786 765 
           <height>71</height>
......
791 770 
      </layout>
792 771 
     </widget>
793 772 
     <widget class="QWidget" name="tabCRS" >
773 
      <property name="geometry" >
774 
       <rect>
775 
        <x>0</x>
776 
        <y>0</y>
777 
        <width>595</width>
778 
        <height>462</height>
779 
       </rect>
780 
      </property>
794 781 
      <attribute name="title" >
795 782 
       <string>CRS</string>
796 783 
      </attribute>
797 784 
      <layout class="QGridLayout" >
798 
       <property name="leftMargin" >
785 
       <property name="margin" >
799 786 
        <number>11</number>
800 787 
       </property>
801 
       <property name="topMargin" >
802 
        <number>11</number>
803 
       </property>
804 
       <property name="rightMargin" >
805 
        <number>11</number>
806 
       </property>
807 
       <property name="bottomMargin" >
808 
        <number>11</number>
809 
       </property>
810 788 
       <item row="3" column="0" >
811 789 
        <spacer>
812 790 
         <property name="orientation" >
813 791 
          <enum>Qt::Vertical</enum>
814 792 
         </property>
815 
         <property name="sizeHint" >
793 
         <property name="sizeHint" stdset="0" >
816 794 
          <size>
817 795 
           <width>51</width>
818 796 
           <height>31</height>
......
836 814 
          <string>When layer is loaded that has no coordinate reference system (CRS)</string>
837 815 
         </property>
838 816 
         <layout class="QVBoxLayout" >
839 
          <property name="leftMargin" >
817 
          <property name="margin" >
840 818 
           <number>11</number>
841 819 
          </property>
842 
          <property name="topMargin" >
843 
           <number>11</number>
844 
          </property>
845 
          <property name="rightMargin" >
846 
           <number>11</number>
847 
          </property>
848 
          <property name="bottomMargin" >
849 
           <number>11</number>
850 
          </property>
851 820 
          <item>
852 821 
           <widget class="QRadioButton" name="radPromptForProjection" >
853 822 
            <property name="text" >
......
875 844 
      </layout>
876 845 
     </widget>
877 846 
     <widget class="QWidget" name="tabLocale" >
847 
      <property name="geometry" >
848 
       <rect>
849 
        <x>0</x>
850 
        <y>0</y>
851 
        <width>595</width>
852 
        <height>462</height>
853 
       </rect>
854 
      </property>
878 855 
      <attribute name="title" >
879 856 
       <string>Locale</string>
880 857 
      </attribute>
......
919 896 
         <property name="orientation" >
920 897 
          <enum>Qt::Vertical</enum>
921 898 
         </property>
922 
         <property name="sizeHint" >
899 
         <property name="sizeHint" stdset="0" >
923 900 
          <size>
924 901 
           <width>501</width>
925 902 
           <height>51</height>
......
946 923 
      </layout>
947 924 
     </widget>
948 925 
     <widget class="QWidget" name="tab" >
926 
      <property name="geometry" >
927 
       <rect>
928 
        <x>0</x>
929 
        <y>0</y>
930 
        <width>595</width>
931 
        <height>462</height>
932 
       </rect>
933 
      </property>
949 934 
      <attribute name="title" >
950 935 
       <string>Proxy</string>
951 936 
      </attribute>
952 
      <layout class="QGridLayout" >
937 
      <layout class="QGridLayout" name="gridLayout_2" >
953 938 
       <item row="0" column="0" >
954 939 
        <widget class="QGroupBox" name="grpProxy" >
955 940 
         <property name="title" >
......
961 946 
         <property name="checkable" >
962 947 
          <bool>true</bool>
963 948 
         </property>
964 
         <layout class="QGridLayout" >
949 
         <layout class="QGridLayout" name="gridLayout" >
965 950 
          <item row="0" column="0" >
966 951 
           <widget class="QLabel" name="lblProxyHost" >
967 952 
            <property name="text" >
......
989 974 
           <widget class="QLineEdit" name="leProxyPort" />
990 975 
          </item>
991 976 
          <item row="2" column="0" >
977 
           <widget class="QLabel" name="lblProxyType" >
978 
            <property name="text" >
979 
             <string>Type</string>
980 
            </property>
981 
            <property name="buddy" >
982 
             <cstring>leProxyPort</cstring>
983 
            </property>
984 
           </widget>
985 
          </item>
986 
          <item row="2" column="1" >
987 
           <widget class="QComboBox" name="leProxyType" >
988 
            <item>
989 
             <property name="text" >
990 
              <string>http</string>
991 
             </property>
992 
            </item>
993 
            <item>
994 
             <property name="text" >
995 
              <string>socks5</string>
996 
             </property>
997 
            </item>
998 
           </widget>
999 
          </item>
1000 
          <item row="3" column="0" >
992 1001 
           <widget class="QLabel" name="lblUser" >
993 1002 
            <property name="text" >
994 1003 
             <string>User</string>
......
998 1007 
            </property>
999 1008 
           </widget>
1000 1009 
          </item>
1001 
          <item row="2" column="1" >
1010 
          <item row="3" column="1" >
1002 1011 
           <widget class="QLineEdit" name="leProxyUser" >
1003 1012 
            <property name="toolTip" >
1004 1013 
             <string>Leave this blank if no proxy username / password are required</string>
1005 1014 
            </property>
1006 1015 
           </widget>
1007 1016 
          </item>
1008 
          <item row="3" column="0" >
1017 
          <item row="4" column="0" >
1009 1018 
           <widget class="QLabel" name="lblPassword" >
1010 1019 
            <property name="text" >
1011 1020 
             <string>Password</string>
......
1015 1024 
            </property>
1016 1025 
           </widget>
1017 1026 
          </item>
1018 
          <item row="3" column="1" >
1027 
          <item row="4" column="1" >
1019 1028 
           <widget class="QLineEdit" name="leProxyPassword" >
1020 1029 
            <property name="toolTip" >
1021 1030 
             <string>Leave this blank if no proxy username / password are required</string>
......
1033 1042 
         <property name="orientation" >
1034 1043 
          <enum>Qt::Vertical</enum>
1035 1044 
         </property>
1036 
         <property name="sizeHint" >
1045 
         <property name="sizeHint" stdset="0" >
1037 1046 
          <size>
1038 1047 
           <width>20</width>
1039 1048 
           <height>40</height>
......
1051 1060 
      <enum>Qt::Horizontal</enum>
1052 1061 
     </property>
1053 1062 
     <property name="standardButtons" >
1054 
      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
1063 
      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
1055 1064 
     </property>
1056 1065 
    </widget>
1057 1066 
   </item>
src/app/qgsoptions.cpp (working copy)
60 60 
  grpProxy->setChecked( settings.value( "proxy/proxyEnabled", "0" ).toBool() );
61 61 
  leProxyHost->setText( settings.value( "proxy/proxyHost", "" ).toString() );
62 62 
  leProxyPort->setText( settings.value( "proxy/proxyPort", "" ).toString() );
63 
  leProxyType->setCurrentIndex( settings.value( "proxy/proxyType", "" ).toInt() );
63 64 
  leProxyUser->setText( settings.value( "proxy/proxyUser", "" ).toString() );
64 65 
  leProxyPassword->setText( settings.value( "proxy/proxyPassword", "" ).toString() );
65 66 
  // set the current theme
......
250 251 
  settings.setValue( "proxy/proxyEnabled", grpProxy->isChecked() );
251 252 
  settings.setValue( "proxy/proxyHost", leProxyHost->text() );
252 253 
  settings.setValue( "proxy/proxyPort", leProxyPort->text() );
254 
  settings.setValue( "proxy/proxyType", leProxyType->currentIndex() );
253 255 
  settings.setValue( "proxy/proxyUser", leProxyUser->text() );
254 256 
  settings.setValue( "proxy/proxyPassword", leProxyPassword->text() );
255 257 
  //general settings