Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed the "child->parent == NULL assertion failed" bug

Browse source
This commit is contained in:
fgerlits 2005-04-27 18:44:15 +00:00
parent 2aea2785ca
commit aac3ce4d28
2 changed files with 52 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

66
livesupport/products/gLiveSupport/src/SearchWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.9 $ Version : $Revision: 1.10 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -75,10 +75,6 @@ SearchWindow :: SearchWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
LocalizedObject(bundle), LocalizedObject(bundle),
gLiveSupport(gLiveSupport) gLiveSupport(gLiveSupport)
{ {
treeModel = Gtk::ListStore::create(modelColumns);
searchResults = constructSearchResults();
Gtk::Box * simpleSearchView = constructSimpleSearchView(); Gtk::Box * simpleSearchView = constructSimpleSearchView();
Gtk::Box * advancedSearchView = constructAdvancedSearchView(); Gtk::Box * advancedSearchView = constructAdvancedSearchView();
Gtk::Box * browseView = constructBrowseView(); Gtk::Box * browseView = constructBrowseView();
@ -96,24 +92,14 @@ SearchWindow :: SearchWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
std::exit(1); std::exit(1);
} }
add(*views); // set up the search results box
Gtk::Box * searchResultsView = constructSearchResultsView();
// create the right-click entry context menu // put them in one big box
contextMenu = Gtk::manage(new Gtk::Menu()); Gtk::VBox * bigBox = Gtk::manage(new Gtk::VBox);
Gtk::Menu::MenuList& contextMenuList = contextMenu->items(); bigBox->pack_start(*views);
bigBox->pack_start(*searchResultsView);
// register the signal handlers for the context menu add(*bigBox);
try {
contextMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("addToScratchpadMenuItem"),
sigc::mem_fun(*this,
&SearchWindow::onAddToScratchpad)));
} catch (std::invalid_argument &e) {
std::cerr << e.what() << std::endl;
std::exit(1);
}
contextMenu->accelerate(*this);
// show // show
set_name("searchWindow"); set_name("searchWindow");
@ -121,7 +107,6 @@ SearchWindow :: SearchWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
set_modal(false); set_modal(false);
property_window_position().set_value(Gtk::WIN_POS_NONE); property_window_position().set_value(Gtk::WIN_POS_NONE);
// showContents();
show_all_children(); show_all_children();
} }
@ -166,7 +151,6 @@ SearchWindow :: constructSimpleSearchView(void) throw ()
// make a new box and pack the main components into it // make a new box and pack the main components into it
Gtk::VBox * view = Gtk::manage(new Gtk::VBox); Gtk::VBox * view = Gtk::manage(new Gtk::VBox);
view->pack_start(*entryBox, Gtk::PACK_EXPAND_WIDGET, 5); view->pack_start(*entryBox, Gtk::PACK_EXPAND_WIDGET, 5);
view->pack_start(*searchResults, Gtk::PACK_EXPAND_WIDGET, 5);
return view; return view;
} }
@ -205,7 +189,6 @@ SearchWindow :: constructAdvancedSearchView(void) throw ()
Gtk::VBox * view = Gtk::manage(new Gtk::VBox); Gtk::VBox * view = Gtk::manage(new Gtk::VBox);
view->pack_start(*advancedSearchEntry, Gtk::PACK_SHRINK, 5); view->pack_start(*advancedSearchEntry, Gtk::PACK_SHRINK, 5);
view->pack_start(*searchButtonBox, Gtk::PACK_SHRINK, 5); view->pack_start(*searchButtonBox, Gtk::PACK_SHRINK, 5);
view->pack_start(*searchResults, Gtk::PACK_EXPAND_WIDGET, 5);
return view; return view;
} }
@ -226,7 +209,6 @@ SearchWindow :: constructBrowseView(void) throw ()
// make a new box and pack the main components into it // make a new box and pack the main components into it
Gtk::VBox * view = Gtk::manage(new Gtk::VBox); Gtk::VBox * view = Gtk::manage(new Gtk::VBox);
view->pack_start(*browseEntry, Gtk::PACK_EXPAND_WIDGET, 5); view->pack_start(*browseEntry, Gtk::PACK_EXPAND_WIDGET, 5);
view->pack_start(*searchResults, Gtk::PACK_EXPAND_WIDGET, 5);
return view; return view;
} }
@ -234,13 +216,13 @@ SearchWindow :: constructBrowseView(void) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Construct the search results display. * Construct the search results display.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
ZebraTreeView* Gtk::VBox*
SearchWindow :: constructSearchResults(void) throw () SearchWindow :: constructSearchResultsView(void) throw ()
{ {
Ptr<WidgetFactory>::Ref wf = WidgetFactory::getInstance(); Ptr<WidgetFactory>::Ref wf = WidgetFactory::getInstance();
ZebraTreeView * searchResults = Gtk::manage(wf->createTreeView( treeModel = Gtk::ListStore::create(modelColumns);
treeModel )); searchResults = Gtk::manage(wf->createTreeView(treeModel));
// add the TreeView's view columns // add the TreeView's view columns
try { try {
@ -259,9 +241,29 @@ SearchWindow :: constructSearchResults(void) throw ()
// register the signal handler for treeview entries being clicked // register the signal handler for treeview entries being clicked
searchResults->signal_button_press_event().connect_notify(sigc::mem_fun( searchResults->signal_button_press_event().connect_notify(sigc::mem_fun(
*this, &SearchWindow::onEntryClicked)); *this, &SearchWindow::onEntryClicked));
return searchResults; // create the right-click entry context menu
contextMenu = Gtk::manage(new Gtk::Menu());
Gtk::Menu::MenuList& contextMenuList = contextMenu->items();
// register the signal handlers for the context menu
try {
contextMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("addToScratchpadMenuItem"),
sigc::mem_fun(*this,
&SearchWindow::onAddToScratchpad)));
} catch (std::invalid_argument &e) {
std::cerr << e.what() << std::endl;
std::exit(1);
}
contextMenu->accelerate(*this);
// 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;
} }

36
livesupport/products/gLiveSupport/src/SearchWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.8 $ Version : $Revision: 1.9 $
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.8 $ * @version $Revision: 1.9 $
*/ */
class SearchWindow : public WhiteWindow, public LocalizedObject class SearchWindow : public WhiteWindow, public LocalizedObject
{ {
@ -94,19 +94,9 @@ class SearchWindow : public WhiteWindow, public LocalizedObject
*/ */
BrowseEntry * browseEntry; BrowseEntry * browseEntry;
/**
* The tree view showing the search results.
*/
ZebraTreeView * searchResults;
/**
* The pop-up context menu for found items.
*/
Gtk::Menu * contextMenu;
/** /**
* Construct the simple search view. * Construct the simple search view.
* If you enter a string in the simple search view and press Enter * If you enter a string in theGtk::VBox simple search view and press Enter
* (or the Search button), the local storage will be searched for * (or the Search button), the local storage will be searched for
* items (both audio clips and playlists) where either the title * items (both audio clips and playlists) where either the title
* (dc:title), the creator (dc:creator) or the album (dc:source) * (dc:title), the creator (dc:creator) or the album (dc:source)
@ -136,10 +126,10 @@ class SearchWindow : public WhiteWindow, public LocalizedObject
/** /**
* Construct the search results display. * Construct the search results display.
* *
* @return a pointer to the new TreeView (already Gtk::manage()'ed) * @return a pointer to the new box (already Gtk::manage()'ed)
*/ */
ZebraTreeView* Gtk::VBox*
constructSearchResults(void) throw (); constructSearchResultsView(void) throw ();
/** /**
* Event handler for the simple Search button getting clicked. * Event handler for the simple Search button getting clicked.
@ -171,7 +161,7 @@ class SearchWindow : public WhiteWindow, public LocalizedObject
* @param event the button event received * @param event the button event received
*/ */
void void
onEntryClicked(GdkEventButton * event) throw (); onEntryClicked(GdkEventButton * event) throw ();
/** /**
* Add a playable to the scratchpad. * Add a playable to the scratchpad.
@ -184,7 +174,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.8 $ * @version $Revision: 1.9 $
*/ */
class ModelColumns : public ZebraTreeModelColumnRecord class ModelColumns : public ZebraTreeModelColumnRecord
{ {
@ -237,6 +227,16 @@ class SearchWindow : public WhiteWindow, public LocalizedObject
*/ */
Glib::RefPtr<Gtk::ListStore> treeModel; Glib::RefPtr<Gtk::ListStore> treeModel;
/**
* The tree view showing the search results.
*/
ZebraTreeView * searchResults;
/**
* The pop-up context menu for found items.
*/
Gtk::Menu * contextMenu;
/** /**
* The GLiveSupport object, holding the state of the application. * The GLiveSupport object, holding the state of the application.
*/ */