Gtk UI: improvements in search widget.

ekzobrain · Jul 9, 2013 · 7038b65 · 7038b65
1 parent 3f58967
commit 7038b65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 28 deletions.
diff --git a/eiskaltdcpp-gtk/src/search.cc b/eiskaltdcpp-gtk/src/search.cc
@@ -1937,7 +1937,7 @@ void Search::on(TimerManagerListener::Second, uint64_t aTick) noexcept {
  {
  // use rounding below to workaround bug in gtk_progress_bar_set_fraction()
  uint fract = (1000 * (aTick - searchStartTime)) / (searchEndTime - searchStartTime);
- double fraction = 1.0f * fract / 1000;
+ float fraction = 1.0f * fract / 1000;
  if (fraction >= 1.0)
  {
  fraction = 1.0;

diff --git a/eiskaltdcpp-gtk/ui/search.ui b/eiskaltdcpp-gtk/ui/search.ui
@@ -221,35 +221,11 @@
  <property name="xscale">0</property>
  <property name="yscale">0</property>
  <child>
- <object class="GtkHBox" id="hbox5">
+ <object class="GtkLabel" id="label8">
  <property name="visible">True</property>
  <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-find</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Search</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">_Search</property>
+ <property name="use_underline">True</property>
  </object>
  </child>
  </object>