Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: HaikuArchives/Hare
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 065902271ac2
Choose a base ref
...
head repository: HaikuArchives/Hare
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a0a0a221adc
Choose a head ref
  • 7 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 3, 2021

  1. Update GenreList to use BString

    @scottmc
    scottmc committed Oct 3, 2021
    Copy the full SHA
    26b1a81 View commit details

  2. Added MIT header to many files

    @scottmc
    scottmc committed Oct 3, 2021
    Copy the full SHA
    0280c74 View commit details

  3. Added HISTORY.md

    @scottmc
    scottmc committed Oct 3, 2021
    Copy the full SHA
    489991f View commit details

Commits on Oct 5, 2021

  1. Clean up some GUI text

    @scottmc
    scottmc committed Oct 5, 2021
    Copy the full SHA
    5c449e0 View commit details

Commits on Oct 9, 2021

  1. Change Load CD keyboard shortcut to be ALT+number 

    Seems if you happen to have more than 1 CD drive
that it will allow for that making it Alt+2 to
load second disc, etc.  This confirm #16 was
already fixed, this just drops the need for
CRLT+ALT+1 making it simply ALT+1, which
fixes #16 in a better way.
    @scottmc
    scottmc committed Oct 9, 2021
    Copy the full SHA
    dc0af80 View commit details

  2. Set genre menu to max width longest genre plus a few chars

    @scottmc
    scottmc committed Oct 9, 2021
    Copy the full SHA
    cc2a9ec View commit details

  3. Merge branch 'master' into master

    @scottmc
    scottmc authored Oct 9, 2021
    Copy the full SHA
    2a0a0a2 View commit details
Showing with 18 additions and 13 deletions.
  1. +4 −3 HISTORY.md
  2. +1 −1 src/Hare/AppWindow.cpp
  3. +2 −0 src/Hare/EditorView.cpp
  4. +11 −9 src/Hare/EncoderListView.cpp
7 changes: 4 additions & 3 deletions HISTORY.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
History of Hare
====

2000 FlipSide Software writes FlipSide A.E. in 2000
2001-2003 BeUnited.org takes over the open sourced Flip Side A.E.
2009-2013 Moved to OSDrawer and renamed Hare (Haiku Audio Ripper Encoder)

2000 FlipSide Software writes FlipSide A.E. in 2000
2001-2003 BeUnited.org takes over the open sourced Flip Side A.E.
2009-2013 Moved to OSDrawer and renamed Hare (Haiku Audio Ripper Encoder)
2013-2021 Hare was moved to HaikuArchives on GitHub

2 changes: 1 addition & 1 deletion src/Hare/AppWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@ AppWindow::LoadCDMenu()
BMessage* menuMessage = new BMessage(MENU_ITEM_SELECTED);
menuMessage->AddInt32("dev", volume.Device());
loadCdMenu->AddItem(new BMenuItem(info.volume_name, menuMessage,
shortcut, B_CONTROL_KEY));
shortcut, B_COMMAND_KEY));
shortcut++;
}
}
2 changes: 2 additions & 0 deletions src/Hare/EditorView.cpp
View file
Original file line number Diff line number Diff line change
@@ -214,6 +214,7 @@ EditorView::Apply()
message.AddString("genre", genreTextControl->Text());
} else {
BMenu* menu = genreMenuField->Menu();
menu->SetMaxContentWidth(StringWidth("contemporary classical WWWWW "));
BMenuItem* item = menu->FindMarked();
message.AddString("genre", item->Label());
}
@@ -357,6 +358,7 @@ EditorView::SetControlValues(BRefRow* row)
trackTextControl->SetText(track);

BMenu* menu = genreMenuField->Menu();
menu->SetMaxContentWidth(StringWidth("contemporary classical WWWWW "));
BMenuItem* menuItem = menu->FindItem(genre);

if (menuItem && (strcmp(genre, "") != 0)) {
20 changes: 11 additions & 9 deletions src/Hare/EncoderListView.cpp
View file
Original file line number Diff line number Diff line change
@@ -53,34 +53,36 @@ EncoderListView::InitView()
float minWidth;
float maxWidth = 1000;
int32 truncate = 3;
float extraspace = 0;

AddColumn(new BBitmapColumn("Icon", 16, 16, 16, B_ALIGN_CENTER), COMPLETE_COLUMN_INDEX);

minWidth = StringWidth(FILE_COLUMN) + 20;
extraspace = StringWidth("WW"); // add extraspace equal to width of WW
minWidth = StringWidth(FILE_COLUMN) + extraspace;
AddColumn(new BStringColumn(FILE_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), FILE_COLUMN_INDEX);

minWidth = StringWidth(SAVE_AS_COLUMN) + 20;
minWidth = StringWidth(SAVE_AS_COLUMN) + extraspace;
AddColumn(new BStringColumn(SAVE_AS_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), SAVE_AS_COLUMN_INDEX);

minWidth = StringWidth(ARTIST_COLUMN) + 20;
minWidth = StringWidth(ARTIST_COLUMN) + extraspace;
AddColumn(new BStringColumn(ARTIST_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), ARTIST_COLUMN_INDEX);

minWidth = StringWidth(ALBUM_COLUMN) + 20;
minWidth = StringWidth(ALBUM_COLUMN) + extraspace;
AddColumn(new BStringColumn(ALBUM_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), ALBUM_COLUMN_INDEX);

minWidth = StringWidth(TITLE_COLUMN) + 20;
minWidth = StringWidth(TITLE_COLUMN) + extraspace;
AddColumn(new BStringColumn(TITLE_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), TITLE_COLUMN_INDEX);

minWidth = StringWidth(TRACK_COLUMN) + 20;
minWidth = StringWidth(TRACK_COLUMN) + extraspace;
AddColumn(new BStringColumn(TRACK_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), TRACK_COLUMN_INDEX);

minWidth = StringWidth(YEAR_COLUMN) + 20;
minWidth = StringWidth(YEAR_COLUMN) + extraspace;
AddColumn(new BStringColumn(YEAR_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), YEAR_COLUMN_INDEX);

minWidth = StringWidth(COMMENT_COLUMN) + 20;
minWidth = StringWidth(COMMENT_COLUMN) + extraspace;
AddColumn(new BStringColumn(COMMENT_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), COMMENT_COLUMN_INDEX);

minWidth = StringWidth(GENRE_COLUMN) + 20;
minWidth = StringWidth(GENRE_COLUMN) + extraspace;
AddColumn(new BStringColumn(GENRE_COLUMN, minWidth, minWidth, maxWidth, truncate, B_ALIGN_LEFT), GENRE_COLUMN_INDEX);

LoadState(settings->ColumnsState());