[Rojav-commits] rocgui/dialogs rocgui-dialogs.pjd,1.24,1.25 turntabledialog.cpp,1.1,1.2 turntabledia
Brought to you by:
robvrs
Menu
▾
▴
[Rojav-commits] rocgui/dialogs rocgui-dialogs.pjd,1.24,1.25 turntabledialog.cpp,1.1,1.2 turntabledialog.h,1.1,1.2
|
From: rob v. <ro...@us...> - 2005-11-30 20:45:45
|
Update of /cvsroot/rojav/rocgui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28553 Modified Files: rocgui-dialogs.pjd turntabledialog.cpp turntabledialog.h Log Message: turntable modifications Index: turntabledialog.h =================================================================== RCS file: /cvsroot/rojav/rocgui/dialogs/turntabledialog.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** turntabledialog.h 28 Nov 2005 20:19:58 -0000 1.1 --- turntabledialog.h 30 Nov 2005 20:45:24 -0000 1.2 *************** *** 60,64 **** #define wxID_STATIC_TT_Z 10014 #define ID_TEXTCTRL_TT_Z 10015 - #define ID_RADIOBOX_TT_ORI 10016 #define ID_PANEL_TT_TRACKS 10127 #define ID_GRID 10128 --- 60,63 ---- *************** *** 145,149 **** wxStaticText* m_LabelZ; wxTextCtrl* m_z; - wxRadioBox* m_ori; wxPanel* m_TracksPanel; wxGrid* m_TracksGrid; --- 144,147 ---- Index: turntabledialog.cpp =================================================================== RCS file: /cvsroot/rojav/rocgui/dialogs/turntabledialog.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** turntabledialog.cpp 28 Nov 2005 20:19:29 -0000 1.1 --- turntabledialog.cpp 30 Nov 2005 20:45:24 -0000 1.2 *************** *** 107,118 **** str = StrOp.fmt( "%d", wTurntable.getz( m_Props ) ); m_z->SetValue( str ); StrOp.free( str ); - if( StrOp.equals( wItem.north, wTurntable.getori( m_Props ) ) ) - m_ori->SetSelection( 0 ); - else if( StrOp.equals( wItem.east, wTurntable.getori( m_Props ) ) || wTurntable.getori( m_Props ) == NULL ) - m_ori->SetSelection( 1 ); - else if( StrOp.equals( wItem.south, wTurntable.getori( m_Props ) ) ) - m_ori->SetSelection( 2 ); - else if( StrOp.equals( wItem.west, wTurntable.getori( m_Props ) ) ) - m_ori->SetSelection( 3 ); // Tracks --- 107,110 ---- *************** *** 149,161 **** wTurntable.sety( m_Props, atoi( m_y->GetValue() ) ); wTurntable.setz( m_Props, atoi( m_z->GetValue() ) ); - int ori = m_ori->GetSelection(); - if( ori == 0 ) - wTurntable.setori( m_Props, wItem.north ); - else if( ori == 1 ) - wTurntable.setori( m_Props, wItem.east ); - else if( ori == 2 ) - wTurntable.setori( m_Props, wItem.south ); - else if( ori == 3 ) - wTurntable.setori( m_Props, wItem.west ); } --- 141,144 ---- *************** *** 182,186 **** m_LabelZ = NULL; m_z = NULL; - m_ori = NULL; m_TracksPanel = NULL; m_TracksGrid = NULL; --- 165,168 ---- *************** *** 259,276 **** itemFlexGridSizer12->Add(m_z, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxString m_oriStrings[] = { - _("&north"), - _("&east"), - _("&south"), - _("&west") - }; - m_ori = new wxRadioBox( m_LocationPanel, ID_RADIOBOX_TT_ORI, _("Orientation"), wxDefaultPosition, wxDefaultSize, 4, m_oriStrings, 1, wxRA_SPECIFY_COLS ); - itemBoxSizer11->Add(m_ori, 0, wxALIGN_TOP|wxALL, 5); - m_Notebook->AddPage(m_LocationPanel, _("Location")); m_TracksPanel = new wxPanel( m_Notebook, ID_PANEL_TT_TRACKS, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); ! wxBoxSizer* itemBoxSizer21 = new wxBoxSizer(wxVERTICAL); ! m_TracksPanel->SetSizer(itemBoxSizer21); m_TracksGrid = new wxGrid( m_TracksPanel, ID_GRID, wxDefaultPosition, wxSize(220, 200), wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL ); --- 241,249 ---- itemFlexGridSizer12->Add(m_z, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); 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 ); *************** *** 280,284 **** m_TracksGrid->SetRowLabelSize(0); m_TracksGrid->CreateGrid(1, 4, wxGrid::wxGridSelectRows); ! itemBoxSizer21->Add(m_TracksGrid, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 2); m_Notebook->AddPage(m_TracksPanel, _("Tracks")); --- 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")); *************** *** 286,299 **** itemBoxSizer2->Add(m_Notebook, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); ! wxStdDialogButtonSizer* itemStdDialogButtonSizerProxy23 = new wxStdDialogButtonSizer; ! itemBoxSizer2->Add(itemStdDialogButtonSizerProxy23, 0, wxGROW|wxALL, 5); m_OK = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); ! itemStdDialogButtonSizerProxy23->AddButton(m_OK); m_Cancel = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); ! itemStdDialogButtonSizerProxy23->AddButton(m_Cancel); ! itemStdDialogButtonSizerProxy23->Realize(); ////@end TurntableDialog content construction --- 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 *************** *** 362,366 **** ////@begin wxEVT_GRID_CELL_LEFT_CLICK event handler for ID_GRID in TurntableDialog. // Before editing this code, remove the block markers. ! event.Skip(true); ////@end wxEVT_GRID_CELL_LEFT_CLICK event handler for ID_GRID in TurntableDialog. } --- 335,339 ---- ////@begin wxEVT_GRID_CELL_LEFT_CLICK event handler for ID_GRID in TurntableDialog. // Before editing this code, remove the block markers. ! event.Skip(); ////@end wxEVT_GRID_CELL_LEFT_CLICK event handler for ID_GRID in TurntableDialog. } Index: rocgui-dialogs.pjd =================================================================== RCS file: /cvsroot/rojav/rocgui/dialogs/rocgui-dialogs.pjd,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** rocgui-dialogs.pjd 28 Nov 2005 20:21:34 -0000 1.24 --- rocgui-dialogs.pjd 30 Nov 2005 20:45:24 -0000 1.25 *************** *** 13,17 **** <value name="author" type="string"></value> <value name="description" type="string"></value> ! <value name="doc_count" type="Integer">262</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">261</value> <value name="xrc_filename" type="string"></value> [...6857 lines suppressed...] <value name="proxy-Custom ctor arguments" type="string"></value> </path> ! <path name="ID000104"> <value name="title" type="string">wxButton: wxID_CANCEL</value> ! <value name="id" type="Integer">179086032</value> <value name="type" type="string">dialog-control-document</value> <value name="filename" type="string"></value> *************** *** 14355,14359 **** <value name="owns-file" type="Integer">1</value> <value name="title-mode" type="Integer">0</value> ! <value name="parent" type="Integer">187490944</value> <value name="locked" type="Integer">1</value> <value name="created" type="string">28/10/2005</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> |
