some cosmetic changes to Search/Browse and Scratchpad
This commit is contained in:
parent
fbe70076e4
commit
45e55e8571
4 changed files with 24 additions and 21 deletions
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.2 $
|
Version : $Revision: 1.3 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/BrowseItem.cxx,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/BrowseItem.cxx,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -98,11 +98,16 @@ BrowseItem :: BrowseItem(
|
||||||
treeModel = Gtk::ListStore::create(modelColumns);
|
treeModel = Gtk::ListStore::create(modelColumns);
|
||||||
|
|
||||||
metadataValues = Gtk::manage(wf->createTreeView(treeModel));
|
metadataValues = Gtk::manage(wf->createTreeView(treeModel));
|
||||||
metadataValues->appendColumn("", modelColumns.column);
|
metadataValues->appendColumn("", modelColumns.column, 200);
|
||||||
|
metadataValues->set_size_request(230,150);
|
||||||
metadataValues->set_headers_visible(false);
|
metadataValues->set_headers_visible(false);
|
||||||
metadataValues->signal_cursor_changed().connect(sigc::mem_fun(*this,
|
metadataValues->signal_cursor_changed().connect(sigc::mem_fun(*this,
|
||||||
&BrowseItem::emitSignalSelectionChanged ));
|
&BrowseItem::emitSignalSelectionChanged ));
|
||||||
pack_start(*metadataValues, Gtk::PACK_SHRINK, 5);
|
|
||||||
|
Gtk::ScrolledWindow * scrolledWindow = Gtk::manage(new Gtk::ScrolledWindow);
|
||||||
|
scrolledWindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
|
||||||
|
scrolledWindow->add(*metadataValues);
|
||||||
|
pack_start(*scrolledWindow, Gtk::PACK_SHRINK, 5);
|
||||||
|
|
||||||
onShow();
|
onShow();
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.11 $
|
Version : $Revision: 1.12 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -242,7 +242,6 @@ ScratchpadWindow :: ScratchpadWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
|
||||||
set_default_size(300, 300);
|
set_default_size(300, 300);
|
||||||
set_modal(false);
|
set_modal(false);
|
||||||
property_window_position().set_value(Gtk::WIN_POS_NONE);
|
property_window_position().set_value(Gtk::WIN_POS_NONE);
|
||||||
set_resizable(true);
|
|
||||||
|
|
||||||
showContents();
|
showContents();
|
||||||
show_all_children();
|
show_all_children();
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.11 $
|
Version : $Revision: 1.12 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -93,17 +93,20 @@ SearchWindow :: SearchWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
|
||||||
}
|
}
|
||||||
|
|
||||||
// set up the search results box
|
// set up the search results box
|
||||||
Gtk::Box * searchResultsView = constructSearchResultsView();
|
ZebraTreeView * searchResultsView = constructSearchResultsView();
|
||||||
|
Gtk::ScrolledWindow * scrolledWindow = Gtk::manage(new Gtk::ScrolledWindow);
|
||||||
|
scrolledWindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
|
||||||
|
scrolledWindow->add(*searchResultsView);
|
||||||
|
|
||||||
// put them in one big box
|
// put them in one big box
|
||||||
Gtk::VBox * bigBox = Gtk::manage(new Gtk::VBox);
|
Gtk::VBox * bigBox = Gtk::manage(new Gtk::VBox);
|
||||||
bigBox->pack_start(*views);
|
bigBox->pack_start(*views, Gtk::PACK_SHRINK);
|
||||||
bigBox->pack_start(*searchResultsView);
|
bigBox->pack_start(*scrolledWindow);
|
||||||
add(*bigBox);
|
add(*bigBox);
|
||||||
|
|
||||||
// show
|
// show
|
||||||
set_name("searchWindow");
|
set_name("searchWindow");
|
||||||
set_default_size(600, 250);
|
set_default_size(600, 500);
|
||||||
set_modal(false);
|
set_modal(false);
|
||||||
property_window_position().set_value(Gtk::WIN_POS_NONE);
|
property_window_position().set_value(Gtk::WIN_POS_NONE);
|
||||||
|
|
||||||
|
@ -216,7 +219,7 @@ SearchWindow :: constructBrowseView(void) throw ()
|
||||||
/*------------------------------------------------------------------------------
|
/*------------------------------------------------------------------------------
|
||||||
* Construct the search results display.
|
* Construct the search results display.
|
||||||
*----------------------------------------------------------------------------*/
|
*----------------------------------------------------------------------------*/
|
||||||
Gtk::VBox*
|
ZebraTreeView *
|
||||||
SearchWindow :: constructSearchResultsView(void) throw ()
|
SearchWindow :: constructSearchResultsView(void) throw ()
|
||||||
{
|
{
|
||||||
Ptr<WidgetFactory>::Ref wf = WidgetFactory::getInstance();
|
Ptr<WidgetFactory>::Ref wf = WidgetFactory::getInstance();
|
||||||
|
@ -263,11 +266,7 @@ SearchWindow :: constructSearchResultsView(void) throw ()
|
||||||
}
|
}
|
||||||
|
|
||||||
contextMenu->accelerate(*this);
|
contextMenu->accelerate(*this);
|
||||||
|
return searchResults;
|
||||||
// make a new box and pack the one and only component into it
|
|
||||||
Gtk::VBox * view = Gtk::manage(new Gtk::VBox);
|
|
||||||
view->pack_start(*searchResults, Gtk::PACK_EXPAND_WIDGET, 5);
|
|
||||||
return view;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.10 $
|
Version : $Revision: 1.11 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.h,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.h,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -73,7 +73,7 @@ using namespace LiveSupport::Widgets;
|
||||||
* The Search/Browse window.
|
* The Search/Browse window.
|
||||||
*
|
*
|
||||||
* @author $Author: fgerlits $
|
* @author $Author: fgerlits $
|
||||||
* @version $Revision: 1.10 $
|
* @version $Revision: 1.11 $
|
||||||
*/
|
*/
|
||||||
class SearchWindow : public WhiteWindow, public LocalizedObject
|
class SearchWindow : public WhiteWindow, public LocalizedObject
|
||||||
{
|
{
|
||||||
|
@ -126,9 +126,9 @@ class SearchWindow : public WhiteWindow, public LocalizedObject
|
||||||
/**
|
/**
|
||||||
* Construct the search results display.
|
* Construct the search results display.
|
||||||
*
|
*
|
||||||
* @return a pointer to the new box (already Gtk::manage()'ed)
|
* @return a pointer to the new tree view (already Gtk::manage()'ed)
|
||||||
*/
|
*/
|
||||||
Gtk::VBox*
|
ZebraTreeView *
|
||||||
constructSearchResultsView(void) throw ();
|
constructSearchResultsView(void) throw ();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -180,7 +180,7 @@ class SearchWindow : public WhiteWindow, public LocalizedObject
|
||||||
* Lists one clip per row.
|
* Lists one clip per row.
|
||||||
*
|
*
|
||||||
* @author $Author: fgerlits $
|
* @author $Author: fgerlits $
|
||||||
* @version $Revision: 1.10 $
|
* @version $Revision: 1.11 $
|
||||||
*/
|
*/
|
||||||
class ModelColumns : public ZebraTreeModelColumnRecord
|
class ModelColumns : public ZebraTreeModelColumnRecord
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue