[developerteam getadooble] SF.net SVN: dooble:[1458] trunk/browser

[<tex...@us...>]

Revision: 1458
          http://dooble.svn.sourceforge.net/dooble/?rev=1458&view=rev
Author:   textfield
Date:     2010-08-30 01:35:53 +0000 (Mon, 30 Aug 2010)

Log Message:
-----------
Prevent the status bar from jittering.

Modified Paths:
--------------
    trunk/browser/Source/dooble.cc
    trunk/browser/Source/dsearchwidget.cc
    trunk/browser/UI/statusBar.ui

Modified: trunk/browser/Source/dooble.cc
===================================================================
--- trunk/browser/Source/dooble.cc	2010-08-30 01:20:06 UTC (rev 1457)
+++ trunk/browser/Source/dooble.cc	2010-08-30 01:35:53 UTC (rev 1458)
@@ -787,9 +787,6 @@
       QString str(url.toString(QUrl::StripTrailingSlash).trimmed());
       QString scheme(QUrl(str).scheme().toLower());
 
-      if(str.isEmpty())
-        str = "http://localhost:8080/yacysearch.html";
-
       /*
       ** Replace the user's text with an improved version.
       */
@@ -1419,11 +1416,6 @@
 			  "&check_time=3&wikipedia=on"
 			  "&yacy=on&eingabe=%1").arg
 	  (ui.searchLineEdit->text().trimmed().replace(" ", "+"));
-      else if(searchName == "my dooble search")
-        urlText = QString
-	  ("http://localhost:8080/yacysearch.html?display=2&count=100"
-	   "&resource=global&query=%1").arg
-	  (ui.searchLineEdit->text().trimmed().replace(" ", "+"));
       else if(searchName == "kvk book search")
 	urlText = QString("http://kvk.ubka.uni-karlsruhe.de/"
 			  "hylib-bin/kvk/nph-kvk2.cgi?maske="

Modified: trunk/browser/Source/dsearchwidget.cc
===================================================================
--- trunk/browser/Source/dsearchwidget.cc	2010-08-30 01:20:06 UTC (rev 1457)
+++ trunk/browser/Source/dsearchwidget.cc	2010-08-30 01:35:53 UTC (rev 1458)
@@ -145,8 +145,6 @@
   menu->addAction(QIcon("Icons/16x16/wikipedia.png"), "Wikipedia");
   menu->addAction(QIcon("Icons/16x16/youtubemp3.png"), "Youtube MP3");
   menu->addAction(QIcon("Icons/16x16/youtube.png"), "Youtube Video");
-  menu->addSeparator();
-  menu->addAction(QIcon("Icons/16x16/dooble.png"), "My Dooble Search");
   connect(menu, SIGNAL(triggered(QAction *)), this,
 	  SLOT(slotSearchTypeChanged(QAction *)));
   pulldownToolButton->setMenu(menu);

Modified: trunk/browser/UI/statusBar.ui
===================================================================
--- trunk/browser/UI/statusBar.ui	2010-08-30 01:20:06 UTC (rev 1457)
+++ trunk/browser/UI/statusBar.ui	2010-08-30 01:35:53 UTC (rev 1458)
@@ -7,9 +7,21 @@
     <x>0</x>
     <y>0</y>
     <width>488</width>
-    <height>24</height>
+    <height>30</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>25</height>
+   </size>
+  </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <property name="spacing">
     <number>1</number>
@@ -43,21 +55,14 @@
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
-       <height>15</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
-    <widget class="QLabel" name="statusLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
+    <widget class="QLabel" name="statusLabel"/>
    </item>
   </layout>
  </widget>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.