Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6537
Modified Files:
BatchProcessDialog.cpp
Log Message:
Fix some visuals on Linux
Index: BatchProcessDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/BatchProcessDialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- BatchProcessDialog.cpp 1 Oct 2006 07:37:47 -0000 1.12
+++ BatchProcessDialog.cpp 1 Oct 2006 08:07:53 -0000 1.13
@@ -87,7 +87,6 @@
{
S.StartVerticalLay(true);
{
-
S.StartStatic(_("&Select chain"), true);
{
S.SetStyle(wxSUNKEN_BORDER | wxLC_REPORT | wxLC_HRULES | wxLC_VRULES |
@@ -99,6 +98,7 @@
S.StartHorizontalLay(wxALIGN_RIGHT, false);
{
+ S.SetBorder(10);
S.Id(ApplyToProjectID).AddButton(_("Apply to Current &Project"));
S.Id(ApplyToFilesID).AddButton(_("Apply to &Files..."));
S.Id(wxID_CANCEL).AddButton(_("&Cancel"));
@@ -108,8 +108,7 @@
S.EndVerticalLay();
wxArrayString names = mBatchCommands.GetNames();
- for (int i = 0; i < names.GetCount(); i++)
- {
+ for (int i = 0; i < (int)names.GetCount(); i++) {
mChains->InsertItem(i, names[i]);
}
@@ -150,9 +149,9 @@
S.StartHorizontalLay(wxCENTER, false);
{
- S.SetBorder(20);
S.StartStatic(_(""), false);
{
+ S.SetBorder(20);
S.AddFixedText(wxString::Format(_("Applying '%s' to current project"),
name.c_str()));
}
@@ -193,8 +192,7 @@
gPrefs->Write(wxT("/Batch/ActiveChain"), name);
AudacityProject *project = GetActiveProject();
- if (!project->GetIsEmpty())
- {
+ if (!project->GetIsEmpty()) {
wxMessageBox(_("Please save and close the current project first."));
return;
}
@@ -249,8 +247,7 @@
S.EndVerticalLay();
int i;
- for (i = 0; i < files.GetCount(); i++ )
- {
+ for (i = 0; i < (int)files.GetCount(); i++ ) {
mList->InsertItem(i, files[i], i == 0);
}
@@ -272,11 +269,9 @@
d.Show();
Hide();
- for (i = 0; i < files.GetCount(); i++)
- {
+ for (i = 0; i < (int)files.GetCount(); i++) {
wxWindowDisabler wd(&d);
- if (i > 0)
- {
+ if (i > 0) {
//Clear the arrow in previous item.
mList->SetItemImage(i - 1, 0, 0);
}
@@ -399,14 +394,10 @@
mChains->SetColumnWidth(0, sz.x);
// Size columns properly
- sz = mList->GetClientSize();
- mList->SetColumnWidth( BlankColumn, 0 ); // First column width is zero, to
hide it.
- mList->SetColumnWidth( ItemNumberColumn, wxLIST_AUTOSIZE );
- mList->SetColumnWidth( ActionColumn, 110 );
- sz.x -= mList->GetColumnWidth(BlankColumn);
- sz.x -= mList->GetColumnWidth(ItemNumberColumn);
- sz.x -= mList->GetColumnWidth(ActionColumn);
- mList->SetColumnWidth(ParamsColumn, sz.x);
+ mList->SetColumnWidth(BlankColumn, 0); // First column width is zero, to
hide it.
+ mList->SetColumnWidth(ItemNumberColumn, wxLIST_AUTOSIZE);
+ mList->SetColumnWidth(ActionColumn, wxLIST_AUTOSIZE);
+ mList->SetColumnWidth(ParamsColumn, wxLIST_AUTOSIZE);
}
/// Defines the dialog and does data exchange with it.
@@ -468,7 +459,7 @@
}
S.EndHorizontalLay();
- GetSizer()->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxALIGN_RIGHT |
wxBOTTOM, 10);
+ GetSizer()->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxALIGN_RIGHT |
wxBOTTOM | wxRIGHT, 10);
return;
}
@@ -480,8 +471,7 @@
int i;
mChains->DeleteAllItems();
- for (i = 0; i < names.GetCount(); i++)
- {
+ for (i = 0; i < (int)names.GetCount(); i++) {
mChains->InsertItem(i, names[i]);
}
@@ -576,6 +566,9 @@
}
PopulateList();
+
+ mList->SetColumnWidth(ItemNumberColumn, wxLIST_AUTOSIZE);
+ mList->SetColumnWidth(ActionColumn, wxLIST_AUTOSIZE);
}
///
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
