[Rojav-commits] rocgui/dialogs rocgui-dialogs.pjd,1.25,1.26 turntabledialog.cpp,1.2,1.3 turntabledia
Brought to you by:
robvrs
Menu
▾
▴
[Rojav-commits] rocgui/dialogs rocgui-dialogs.pjd,1.25,1.26 turntabledialog.cpp,1.2,1.3 turntabledialog.h,1.2,1.3
|
From: rob v. <ro...@us...> - 2005-12-01 20:44:45
|
Update of /cvsroot/rojav/rocgui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1493 Modified Files: rocgui-dialogs.pjd turntabledialog.cpp turntabledialog.h Log Message: turntabledialog modified Index: turntabledialog.h =================================================================== RCS file: /cvsroot/rojav/rocgui/dialogs/turntabledialog.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** turntabledialog.h 30 Nov 2005 20:45:24 -0000 1.2 --- turntabledialog.h 1 Dec 2005 20:44:18 -0000 1.3 *************** *** 51,56 **** #define wxID_STATIC_TT_ID 10001 #define ID_TEXTCTRL_TT_ID 10002 ! #define wxID_STATIC_TT_TYPE 10004 ! #define ID_COMBOBOX_TT_TYPE 10005 #define ID_PANEL_TT_LOCATION 10006 #define wxID_STATIC_TT_X 10010 --- 51,56 ---- #define wxID_STATIC_TT_ID 10001 #define ID_TEXTCTRL_TT_ID 10002 ! #define wxID_STATIC_TT_DESC 10133 ! #define ID_TEXTCTRL_TT_DESC 10129 #define ID_PANEL_TT_LOCATION 10006 #define wxID_STATIC_TT_X 10010 *************** *** 60,65 **** #define wxID_STATIC_TT_Z 10014 #define ID_TEXTCTRL_TT_Z 10015 ! #define ID_PANEL_TT_TRACKS 10127 ! #define ID_GRID 10128 ////@end control identifiers --- 60,72 ---- #define wxID_STATIC_TT_Z 10014 #define ID_TEXTCTRL_TT_Z 10015 ! #define ID_PANEL_TT_INTERFACE 10130 ! #define wxID_STATIC_TT_IID 10127 ! #define ID_TEXTCTRL_TT_IID 10128 ! #define wxID_STATIC_TT_ADDRESS 10131 ! #define ID_TEXTCTRL_TT_ADDRESS 10132 ! #define wxID_STATIC_TT_TYPE 10004 ! #define ID_COMBOBOX_TT_TYPE 10005 ! #define ID_PANEL_TT_TRACKS 10007 ! #define ID_GRID 10008 ////@end control identifiers *************** *** 135,140 **** wxStaticText* m_LabelID; wxTextCtrl* m_ID; ! wxStaticText* m_LabelType; ! wxComboBox* m_Type; wxPanel* m_LocationPanel; wxStaticText* m_LabelX; --- 142,147 ---- wxStaticText* m_LabelID; wxTextCtrl* m_ID; ! wxStaticText* m_LabelDesc; ! wxTextCtrl* m_Desc; wxPanel* m_LocationPanel; wxStaticText* m_LabelX; *************** *** 144,147 **** --- 151,161 ---- wxStaticText* m_LabelZ; wxTextCtrl* m_z; + wxPanel* m_Interface; + wxStaticText* m_Labeliid; + wxTextCtrl* m_IID; + wxStaticText* m_LabelAddress; + wxTextCtrl* m_Address; + wxStaticText* m_LabelType; + wxComboBox* m_Type; wxPanel* m_TracksPanel; wxGrid* m_TracksGrid; Index: turntabledialog.cpp =================================================================== RCS file: /cvsroot/rojav/rocgui/dialogs/turntabledialog.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** turntabledialog.cpp 30 Nov 2005 20:45:24 -0000 1.2 --- turntabledialog.cpp 1 Dec 2005 20:44:18 -0000 1.3 *************** *** 96,102 **** // General m_ID->SetValue( wTurntable.getid( m_Props ) ); ! m_Type->Append( wTurntable.m6082 ); ! m_Type->Append( wTurntable.m7687 ); ! m_Type->SetStringSelection( wTurntable.gettype( m_Props ) ); // Location --- 96,100 ---- // General m_ID->SetValue( wTurntable.getid( m_Props ) ); ! m_Desc->SetValue( wTurntable.getdesc( m_Props ) ); // Location *************** *** 108,111 **** --- 106,118 ---- m_z->SetValue( str ); StrOp.free( str ); + // Interface + m_IID->SetValue( wTurntable.getiid( m_Props ) ); + str = StrOp.fmt( "%d", wTurntable.getaddr( m_Props ) ); + m_Address->SetValue( str ); + StrOp.free( str ); + m_Type->Append( wTurntable.m6082 ); + m_Type->Append( wTurntable.m7687 ); + m_Type->SetStringSelection( wTurntable.gettype( m_Props ) ); + // Tracks m_TracksGrid->DeleteRows(0,m_TracksGrid->GetNumberRows()); *************** *** 135,139 **** // General wTurntable.setid( m_Props, m_ID->GetValue() ); ! wTurntable.settype( m_Props, m_Type->GetStringSelection() ); // Location --- 142,146 ---- // General wTurntable.setid( m_Props, m_ID->GetValue() ); ! wTurntable.setdesc( m_Props, m_Desc->GetValue() ); // Location *************** *** 142,145 **** --- 149,156 ---- wTurntable.setz( m_Props, atoi( m_z->GetValue() ) ); + // Interface + wTurntable.setiid( m_Props, m_IID->GetValue() ); + wTurntable.setaddr( m_Props, atoi( m_Address->GetValue() ) ); + wTurntable.settype( m_Props, m_Type->GetStringSelection() ); } *************** *** 156,161 **** m_LabelID = NULL; m_ID = NULL; ! m_LabelType = NULL; ! m_Type = NULL; m_LocationPanel = NULL; m_LabelX = NULL; --- 167,172 ---- m_LabelID = NULL; m_ID = NULL; ! m_LabelDesc = NULL; ! m_Desc = NULL; m_LocationPanel = NULL; m_LabelX = NULL; *************** *** 165,168 **** --- 176,186 ---- m_LabelZ = NULL; m_z = NULL; + m_Interface = NULL; + m_Labeliid = NULL; + m_IID = NULL; + m_LabelAddress = NULL; + m_Address = NULL; + m_LabelType = NULL; + m_Type = NULL; m_TracksPanel = NULL; m_TracksGrid = NULL; *************** *** 206,217 **** m_ID = new wxTextCtrl( m_GeneralPanel, ID_TEXTCTRL_TT_ID, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); ! itemFlexGridSizer5->Add(m_ID, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); ! m_LabelType = new wxStaticText( m_GeneralPanel, wxID_STATIC_TT_TYPE, _("type"), wxDefaultPosition, wxDefaultSize, 0 ); ! itemFlexGridSizer5->Add(m_LabelType, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); ! wxString* m_TypeStrings = NULL; ! m_Type = new wxComboBox( m_GeneralPanel, ID_COMBOBOX_TT_TYPE, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_TypeStrings, wxCB_DROPDOWN ); ! itemFlexGridSizer5->Add(m_Type, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_Notebook->AddPage(m_GeneralPanel, _("General")); --- 224,234 ---- m_ID = new wxTextCtrl( m_GeneralPanel, ID_TEXTCTRL_TT_ID, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); ! itemFlexGridSizer5->Add(m_ID, 1, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); ! m_LabelDesc = new wxStaticText( m_GeneralPanel, wxID_STATIC_TT_DESC, _("Desc."), wxDefaultPosition, wxDefaultSize, 0 ); ! itemFlexGridSizer5->Add(m_LabelDesc, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); ! m_Desc = new wxTextCtrl( m_GeneralPanel, ID_TEXTCTRL_TT_DESC, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); ! itemFlexGridSizer5->Add(m_Desc, 0, wxALIGN_LEFT|wxGROW|wxALL, 5); m_Notebook->AddPage(m_GeneralPanel, _("General")); *************** *** 243,249 **** m_Notebook->AddPage(m_LocationPanel, _("Location")); m_TracksPanel = new wxPanel( m_Notebook, ID_PANEL_TT_TRACKS, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); ! wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxVERTICAL); ! m_TracksPanel->SetSizer(itemBoxSizer20); m_TracksGrid = new wxGrid( m_TracksPanel, ID_GRID, wxDefaultPosition, wxSize(220, 200), wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL ); --- 260,292 ---- m_Notebook->AddPage(m_LocationPanel, _("Location")); + m_Interface = new wxPanel( m_Notebook, ID_PANEL_TT_INTERFACE, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); + wxFlexGridSizer* itemFlexGridSizer20 = new wxFlexGridSizer(2, 2, 0, 0); + itemFlexGridSizer20->AddGrowableCol(1); + m_Interface->SetSizer(itemFlexGridSizer20); + + m_Labeliid = new wxStaticText( m_Interface, wxID_STATIC_TT_IID, _("iid"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer20->Add(m_Labeliid, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + m_IID = new wxTextCtrl( m_Interface, ID_TEXTCTRL_TT_IID, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer20->Add(m_IID, 0, wxALIGN_LEFT|wxGROW|wxALL, 5); + + m_LabelAddress = new wxStaticText( m_Interface, wxID_STATIC_TT_ADDRESS, _("address"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer20->Add(m_LabelAddress, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + m_Address = new wxTextCtrl( m_Interface, ID_TEXTCTRL_TT_ADDRESS, _("0"), wxDefaultPosition, wxDefaultSize, wxTE_CENTRE ); + itemFlexGridSizer20->Add(m_Address, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + + m_LabelType = new wxStaticText( m_Interface, wxID_STATIC_TT_TYPE, _("type"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer20->Add(m_LabelType, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + wxString* m_TypeStrings = NULL; + m_Type = new wxComboBox( m_Interface, ID_COMBOBOX_TT_TYPE, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_TypeStrings, wxCB_DROPDOWN ); + itemFlexGridSizer20->Add(m_Type, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + + m_Notebook->AddPage(m_Interface, _("Interface")); + m_TracksPanel = new wxPanel( m_Notebook, ID_PANEL_TT_TRACKS, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); ! wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxVERTICAL); ! m_TracksPanel->SetSizer(itemBoxSizer28); m_TracksGrid = new wxGrid( m_TracksPanel, ID_GRID, wxDefaultPosition, wxSize(220, 200), wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL ); *************** *** 253,257 **** m_TracksGrid->SetRowLabelSize(0); m_TracksGrid->CreateGrid(1, 4, wxGrid::wxGridSelectRows); ! itemBoxSizer20->Add(m_TracksGrid, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2); m_Notebook->AddPage(m_TracksPanel, _("Tracks")); --- 296,300 ---- m_TracksGrid->SetRowLabelSize(0); m_TracksGrid->CreateGrid(1, 4, wxGrid::wxGridSelectRows); ! itemBoxSizer28->Add(m_TracksGrid, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2); m_Notebook->AddPage(m_TracksPanel, _("Tracks")); *************** *** 259,272 **** itemBoxSizer2->Add(m_Notebook, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); ! wxStdDialogButtonSizer* itemStdDialogButtonSizerProxy22 = new wxStdDialogButtonSizer; ! itemBoxSizer2->Add(itemStdDialogButtonSizerProxy22, 0, wxGROW|wxALL, 5); m_OK = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); ! itemStdDialogButtonSizerProxy22->AddButton(m_OK); m_Cancel = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); ! itemStdDialogButtonSizerProxy22->AddButton(m_Cancel); ! itemStdDialogButtonSizerProxy22->Realize(); ////@end TurntableDialog content construction --- 302,315 ---- itemBoxSizer2->Add(m_Notebook, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); ! wxStdDialogButtonSizer* itemStdDialogButtonSizerProxy30 = new wxStdDialogButtonSizer; ! itemBoxSizer2->Add(itemStdDialogButtonSizerProxy30, 0, wxGROW|wxALL, 5); m_OK = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); ! itemStdDialogButtonSizerProxy30->AddButton(m_OK); m_Cancel = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); ! itemStdDialogButtonSizerProxy30->AddButton(m_Cancel); ! itemStdDialogButtonSizerProxy30->Realize(); ////@end TurntableDialog content construction Index: rocgui-dialogs.pjd =================================================================== RCS file: /cvsroot/rojav/rocgui/dialogs/rocgui-dialogs.pjd,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** rocgui-dialogs.pjd 30 Nov 2005 20:45:24 -0000 1.25 --- rocgui-dialogs.pjd 1 Dec 2005 20:44:18 -0000 1.26 *************** *** 13,17 **** <value name="author" type="string"></value> <value name="description" type="string"></value> ! <value name="doc_count" type="Integer">261</value> <value name="xrc_filename" type="string"></value> <value name="convert_images_to_xpm" type="bool">FALSE</value> --- 13,17 ---- <value name="author" type="string"></value> <value name="description" type="string"></value> ! <value name="doc_count" type="Integer">269</value> <value name="xrc_filename" type="string"></value> [...7449 lines suppressed...] <value name="proxy-Custom ctor arguments" type="string"></value> </path> ! <path name="ID00010c"> <value name="title" type="string">wxButton: wxID_CANCEL</value> ! <value name="id" type="Integer">193883160</value> <value name="type" type="string">dialog-control-document</value> <value name="filename" type="string"></value> *************** *** 14311,14315 **** <value name="owns-file" type="Integer">1</value> <value name="title-mode" type="Integer">0</value> ! <value name="parent" type="Integer">179023224</value> <value name="locked" type="Integer">1</value> <value name="created" type="string">28/10/2005</value> --- 14783,14787 ---- <value name="owns-file" type="Integer">1</value> <value name="title-mode" type="Integer">0</value> ! <value name="parent" type="Integer">193860400</value> <value name="locked" type="Integer">1</value> <value name="created" type="string">28/10/2005</value> |
