Skip to content

Commit

Permalink
Remove checkboxes MultiSession and On-the-fly
Browse files Browse the repository at this point in the history
These optins aren't implemented yet and the checkboxed were always
greyed out. I decided to remove them from the GUI for now. In any
way, they only apply to the DataView, if I understand them correctly,
and should therefore be moved there, once they are implemented.

Updated documentation and catkeys.
  • Loading branch information
Humdinger committed Jan 2, 2017
1 parent 2eef3d5 commit df8e10f
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 25 deletions.
5 changes: 2 additions & 3 deletions Docs/ReadMe.html
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,14 @@ <h2>
<a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
<a id="session" name="session">The Session Settings</a></h2>

<p>The Session settings at the top of the window apply to all the different project modes described further down (besides blanking a CD-RW which doesn't need all those settings).</p>
<p>The Session settings at the top of the window apply to all the different project modes described further down.</p>

<div align = "center">
<img src="./images/session_settings.png" alt="The session settings" />
</div>

<h3>Checkboxes</h3>
<p>The features of the top two checkmarks <span class="menu">MultiSession</span> and <span class="menu">On-the-fly</span> are currently not implemented and are therefore grayed out.<br />
<span class="menu">Simulation</span> is a dummy mode that goes through all the motions without actually burning anything onto the disc.<br />
<p><span class="menu">Simulation</span> is a dummy mode that goes through all the motions without actually burning anything onto the disc.<br />
<span class="menu">Eject after burning</span> does just that. A good way to remind you that your CD's finished while you're busy elsewhere.</p>

<h3>Speed slider</h3>
Expand Down
Binary file modified Docs/images/overview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Docs/images/session_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 13 additions & 12 deletions Source/BurnWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,11 @@ BurnWindow::_CreateToolBar()
// TODO These values should be obtained from the capabilities
// of the drive and the type of media

fMultiCheck = new BCheckBox("MultiSessionCheckBox",
B_TRANSLATE("MultiSession"), new BMessage());
fOntheflyCheck = new BCheckBox("OnTheFlyCheckBox",
B_TRANSLATE("On-the-fly"), new BMessage());
// Not implemented. Should be moved to DataView?
// fMultiCheck = new BCheckBox("MultiSessionCheckBox",
// B_TRANSLATE("MultiSession"), new BMessage());
// fOntheflyCheck = new BCheckBox("OnTheFlyCheckBox",
// B_TRANSLATE("On-the-fly"), new BMessage());
fSimulationCheck = new BCheckBox("SimulationCheckBox",
B_TRANSLATE("Simulation"), new BMessage());
fEjectCheck = new BCheckBox("EjectCheckBox",
Expand All @@ -288,9 +289,9 @@ BurnWindow::_CreateToolBar()
//Apply settings (and disable unimplemented options)
AppSettings* settings = my_app->Settings();

fMultiCheck->SetEnabled(false);
// fMultiCheck->SetEnabled(false);
// fOntheflyCheck->SetEnabled(false);
fEjectCheck->SetValue((int32)settings->GetEject());
fOntheflyCheck->SetEnabled(false);
fSpeedSlider->SetValue(settings->GetSpeed());
_UpdateSpeedSlider(NULL);

Expand All @@ -301,10 +302,10 @@ BurnWindow::_CreateToolBar()
.AddGroup(B_VERTICAL)
.AddGlue()
.AddGrid(kControlPadding, 0.0)
.Add(fMultiCheck, 0, 0)
.Add(fOntheflyCheck, 1, 0)
.Add(fSimulationCheck, 0, 1)
.Add(fEjectCheck, 1, 1)
// .Add(fMultiCheck, 0, 0)
// .Add(fOntheflyCheck, 1, 0)
.Add(fSimulationCheck, 0, 0)
.Add(fEjectCheck, 0, 1)
.End()
.AddGlue()
.End()
Expand Down Expand Up @@ -519,8 +520,8 @@ BurnWindow::GetSessionConfig()
else
fConfig.mode = "-sao";

fConfig.multisession = fMultiCheck->Value();
fConfig.onthefly = fOntheflyCheck->Value();
// fConfig.multisession = fMultiCheck->Value();
// fConfig.onthefly = fOntheflyCheck->Value();
fConfig.simulation = fSimulationCheck->Value();
fConfig.eject = fEjectCheck->Value();
// Speed slider value get's updated in _UpdateSpeedSlider()
Expand Down
6 changes: 3 additions & 3 deletions Source/BurnWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ class BurnWindow : public BWindow {
void _OpenWebSite();
void _OpenHelp();
void _UpdateSpeedSlider(BMessage* message);

BTabView* fTabView;

BMenu* fSessionMenu;
BMenu* fDeviceMenu;
BMenuItem* fCacheQuitItem;
BCheckBox* fMultiCheck;
BCheckBox* fOntheflyCheck;
// BCheckBox* fMultiCheck;
// BCheckBox* fOntheflyCheck;
BCheckBox* fSimulationCheck;
BCheckBox* fEjectCheck;
BSlider* fSpeedSlider;
Expand Down
6 changes: 2 additions & 4 deletions Source/locales/de.catkeys
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 German application/x-vnd.haikuarchives.BurnItNow2 744208026
1 German application/x-vnd.haikuarchives.BurnItNow 544233544
Thank you Application Danke
BurnItNow %version%\n\tby the BurnItNow team\n\tand\n\tHumdinger,\n\tPrzemysław Buczkowski,\n\tRobert Mercer.\n\n\tCopyright %years%\n\nBurnItNow is a graphical frontend to cdrecord, readcd and mkisofs.\n\nPlease report the bugs you find or features you miss. The contact info is in the usage instructions in the 'Help' menu. Application Don't change the variables %years% and %version%. BurnItNow %version%\n\tvomBurnItNow Team\n\tund\n\tHumdinger,\n\tPrzemysław Buczkowski,\n\tRobert Mercer.\n\n\tCopyright %years%\n\nBurnItNow ist eine grafische Oberfläche für cdrecord, readcd und mkisofs.\n\nBerichte zu Bugs oder gewünschten Features sind sehr willkommen. Kontaktinfos befinden sich in der Bedienungsanleitung aus dem 'Hilfe' Menü.
Audio Audio view Audio
Expand Down Expand Up @@ -60,10 +60,8 @@ App Main window App
Burn speed: Main window Brenn-Speed:
Clear cache now Main window Cache jetzt leeren
Clear cache on quit Main window Cache beim Beenden leeren
Eject after burning Main window Disc auswerfen
Eject after burning Main window Disc nach Brennen auswerfen
Help Main window Hilfe
MultiSession Main window MultiSession
On-the-fly Main window On-the-fly
Project website Main window Projekt Webseite
Simulation Main window Simulation
Tools & settings Main window Tools & Einstellungen
Expand Down
4 changes: 1 addition & 3 deletions Source/locales/en.catkeys
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1 English application/x-vnd.haikuarchives.BurnItNow2 744208026
1 English application/x-vnd.haikuarchives.BurnItNow 544233544
Thank you Application Thank you
BurnItNow %version%\n\tby the BurnItNow team\n\tand\n\tHumdinger,\n\tPrzemysław Buczkowski,\n\tRobert Mercer.\n\n\tCopyright %years%\n\nBurnItNow is a graphical frontend to cdrecord, readcd and mkisofs.\n\nPlease report the bugs you find or features you miss. The contact info is in the usage instructions in the 'Help' menu. Application Don't change the variables %years% and %version%. BurnItNow %version%\n\tby the BurnItNow team\n\tand\n\tHumdinger,\n\tPrzemysław Buczkowski,\n\tRobert Mercer.\n\n\tCopyright %years%\n\nBurnItNow is a graphical frontend to cdrecord, readcd and mkisofs.\n\nPlease report the bugs you find or features you miss. The contact info is in the usage instructions in the 'Help' menu.
Audio Audio view Audio
Expand Down Expand Up @@ -62,8 +62,6 @@ Clear cache now Main window Clear cache now
Clear cache on quit Main window Clear cache on quit
Eject after burning Main window Eject after burning
Help Main window Help
MultiSession Main window MultiSession
On-the-fly Main window On-the-fly
Project website Main window Project website
Simulation Main window Simulation
Tools & settings Main window Tools & settings
Expand Down

0 comments on commit df8e10f

Please sign in to comment.