diff options
| author | Bastian Wissler | 2008-10-16 14:46:13 +0200 |
|---|---|---|
| committer | Bastian Wissler | 2008-10-16 14:46:13 +0200 |
| commit | 0943fd67ef7e9928e3f5006e2873b78e87ef4c17 (patch) | |
| tree | 2e58e8d26f53faed3aebfc9ce739797bdb8ce885 | |
| parent | vmchooser fixes: * group item is now considered - version 0.0.3 / xserver: * ... (diff) | |
| download | vmchooser-0943fd67ef7e9928e3f5006e2873b78e87ef4c17.tar.gz vmchooser-0943fd67ef7e9928e3f5006e2873b78e87ef4c17.tar.xz vmchooser-0943fd67ef7e9928e3f5006e2873b78e87ef4c17.zip | |
vmchooser version 0.0.4: * fixed horizontal scrollbar -> no extend symbols / * added startup script to desktop.default / * added option vmchooser xmlpath option
git-svn-id: http://svn.openslx.org/svn/openslx/openslx-src-tools/vmchooser/trunk@2329 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | vmchooser/SWindow.cxx | 9 | ||||
| -rw-r--r-- | vmchooser/main.cxx | 2 | ||||
| -rw-r--r-- | vmchooser/readXmlDir.cxx | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/vmchooser/SWindow.cxx b/vmchooser/SWindow.cxx index 9906fd8..e388d3f 100644 --- a/vmchooser/SWindow.cxx +++ b/vmchooser/SWindow.cxx @@ -27,6 +27,7 @@ SWindow::SWindow(int w, int h, char* p) exit_btn(10, h-40, w/3 -10, 30, "EXIT"), sel(10,10, w-20, h-50) { +// sel.indented(1); begin(); add_resizable(sel); add(exit_btn); @@ -43,7 +44,6 @@ SWindow::SWindow(int w, int h, char* p) Style* sel_style = new Style(*fltk::Browser::default_style); - sel.indented(1); Font* f1 = font("sans"); //Font* f1bold = f1->bold(); @@ -60,7 +60,7 @@ SWindow::SWindow(int w, int h, char* p) go.style(btn_style); sel.style(sel_style); - const int widths[] = { 2*((w-30)/3), (w-30)/3, -1, 0 }; + const int widths[] = { -1,-1,-1,-1, 0 }; sel.column_widths(widths); end(); @@ -132,8 +132,8 @@ void SWindow::set_lin_entries(DataEntry** ent) } map<string, DataEntry*>::iterator it= mapEntry.begin(); for(;it!=mapEntry.end(); it++) { - Item* w= (Item*)sel.add_leaf(it->second->short_description.c_str() , lin_entgroup, (void*)it->second ); - +// Item* w= (Item*)sel.add_leaf(it->second->short_description.c_str() , lin_entgroup, (void*)it->second ); + Item* w= (Item*)lin_entgroup->add(it->second->short_description.c_str(), (void*)it->second ); xpmImage* xpm = new xpmImage(get_symbol(it->second)); ((Widget*) w)->image(xpm); w->tooltip(it->second->description.c_str()); @@ -198,6 +198,7 @@ void SWindow::unfold_entries() { curr = (Item*) sel.item(); //sel.set_focus(); //sel.set_item_selected(true,1); + //sel.indented(false); } diff --git a/vmchooser/main.cxx b/vmchooser/main.cxx index 982b3e4..b66cc19 100644 --- a/vmchooser/main.cxx +++ b/vmchooser/main.cxx @@ -111,7 +111,7 @@ int main(int argc, char** argv) { delete opt; // just print out version information - helps testing - cout << "virtual machine chooser 0.0.3"<< endl; + cout << "virtual machine chooser 0.0.4"<< endl; if(version) { exit(1); } diff --git a/vmchooser/readXmlDir.cxx b/vmchooser/readXmlDir.cxx index 989032e..985920e 100644 --- a/vmchooser/readXmlDir.cxx +++ b/vmchooser/readXmlDir.cxx @@ -245,6 +245,7 @@ DataEntry** readXmlDir(char* path) while(fgets(line, MAX_LENGTH, inp ) != NULL) { xmlVec.push_back(string(line).substr(0,strlen(line)-1) ); } + pclose(inp); } xmlDoc *doc = NULL; |