HaikuArchives · Oct 27, 2021
Showing with 146 additions and 137 deletions.

+63 −58 locales/de.catkeys

+3 −2 locales/en.catkeys

+63 −58 locales/ja.catkeys

+15 −11 source/aklistview.cpp

+1 −0 source/aklistview.h

+0 −7 source/appview.cpp

+0 −1 source/appview.h

+1 −0 source/guistrings.h
diff --git a/locales/de.catkeys b/locales/de.catkeys
@@ -1,69 +1,74 @@
-1	German	application/x-vnd.armyknife	3412892590
-MPEG	Mode menu		MPEG
-Genre	Tag type		Genre
-0 have ID3v1 tags.	MPEG information		0 haben ID3v1-Tags.
-Reset	Edit menu: Selecting files		Zurücksetzen
-No image	Status		Kein Bild
-Next File	Edit menu: Selecting files		Nächste Datei
-Last File	Edit menu: Selecting files		Letzte Datei
-Copy	Edit menu: Copy/Paste		Kopieren
-Pattern:	Pattern label		Muster:
-Tags	Edit mode operation		Tags
-Select All Unsupported	Edit menu: Selecting files		Alle nicht Unterstützten auswählen
-Next Mode	Mode menu		Nächster Modus
-Paste	Edit menu: Copy/Paste		Einfügen
-Online Tag Lookup	Window title		Online-Tag-Suche
-Name → Attributes	Conversion type		Name → Attribute
-Year	Tag type		Jahr
+1	English	application/x-vnd.armyknife	3052435526
 Info	MPEG information		Info
-Title	Tag type		Titel
-Excellent	About message	In context, this means \"dismiss\"	Hervorragend
-0 have APE tags.	MPEG information		0 haben APE-Tags.
-Select All	Edit menu: Selecting files		Alle auswählen
-Album = /n	Pattern explanation	Leave /n untouched.	Album = /n
-Previous Mode	Mode menu		Vorheriger Modus
-Clear List	Edit menu: Selecting files		Liste leeren
-Album	Tag type		Album
-Quit	File menu		Schließen
+Copy	Edit menu: Copy/Paste		Kopieren
+Open	File menu		Öffnen
+Attributes	Edit mode operation		Attribute
 Remove	MPEG operation		Entfernen
- selected	Main action		 ausgewählt
 Copy	Mode menu		Kopieren
-0 files in selection.	MPEG information		0 Dateien ausgewählt.
-About...	File menu		Über...
-idle	Status		untätig
-Add/Remove	MPEG operation		Hinzufügen/Entfernen
-Track	Tag type		Nummer
-Working…	Query lookup button		Arbeitet…
+Changelog	Help menu		Änderungsprotokoll
+Previous file	Edit menu: Selecting files		Vorherige Datei
+Track = /k	Pattern explanation	Leave /k untouched.	Nummer = /k
+Select all	Edit menu: Selecting files		Alle auswählen
+Cover	Tag type		Cover
+About ArmyKnife	File menu		Über ArmyKnife
 Cancel	Main action		Abbrechen
-Apply	Main action		Anwenden
-Tags → Attributes	Conversion type		Tags → Attribute
-Name	Mode menu		Name
-Also Apply To Attributes	Edit mode operation		Auch auf Attribute anwenden
-Show More	Query lookup button		Mehr anzeigen
-First File	Edit menu: Selecting files		Erste Datei
-Attributes	Edit mode operation		Attribute
-Genre = /g	Pattern explanation	Leave /g untouched.	Genre = /g
-0 have ID3v2 tags.	MPEG information		0 haben ID3v2-Tags.
-Year = /y	Pattern explanation	Leave /y untouched.	Jahr = /y
 No more results	Query lookup button		Keine weiteren Ergebnisse
-Previous File	Edit menu: Selecting files		Vorherige Datei
+Artist	Tag type		Künstler
+Online tag lookup…	Editor view button		Online-Tag-Suche…
+Save	Main action		Speichern
+Online tag lookup	Window title		Online-Tag-Suche
+Paste	Edit menu: Copy/Paste		Einfügen
+Add	MPEG operation		Hinzufügen
+Reset	Edit menu: Selecting files		Zurücksetzen
+0 have ID3v1 tags	MPEG information		0 haben ID3v1-Tags
+Edit	Edit menu: Copy/Paste		Bearbeiten
+Select all unsupported	Edit menu: Selecting files		Alle nicht Unterstützten auswählen
+No image	Status		Kein Bild
+idle	Status		untätig
+Help	Help menu		Hilfe
+Working…	Query lookup button		Arbeitet…
 Cut	Edit menu: Copy/Paste		Ausschneiden
-Also Apply To Tags	Edit mode operation		Auch auf Tags anwenden
-Edit	Mode menu		Bearbeiten
+Clear list	Edit menu: Selecting files		Liste leeren
+Pattern:	Pattern label		Muster:
 Mode	Mode menu		Modus
+Tags	Edit mode operation		Tags
+Comment = /c	Pattern explanation	Leave /c untouched.	Kommentar = /c
+Show more	Query lookup button		Mehr anzeigen
+0 have ID3v2 tags	MPEG information		0 haben ID3v2-Tags
+Name	Mode menu		Name
+Track	Tag type		Nummer
+Previous mode	Mode menu		Vorheriger Modus
 Add	Main action		Hinzufügen
-File	File menu		Datei
-Attributes → Tags	Conversion type		Attribute → Tags
+Genre = /g	Pattern explanation	Leave /g untouched.	Genre = /g
+Attributes → Name	Conversion type		Attribute → Name
+First file	Edit menu: Selecting files		Erste Datei
+Title	Tag type		Titel
 Comment	Tag type		Kommentar
+Tags → Attributes	Conversion type		Tags → Attribute
+Last file	Edit menu: Selecting files		Letzte Datei
+Reset	Main action		Zurücksetzen
+ selected	Main action		 ausgewählt
+Album	Tag type		Album
 Wildcard = /*	Pattern explanation	Leave /* untouched.	Beliebig = /*
-Artist	Tag type		Künstler
-Online Tag Lookup…	Editor view button		Online-Tag-Suche…
-Edit	Edit menu: Copy/Paste		Bearbeiten
-The Army Knife	System name		The Army Knife
-Artist = /a	Pattern explanation	Leave /a untouched.	Künstler = /a
 Title = /t	Pattern explanation	Leave /t untouched.	Titel = /t
-Attributes → Name	Conversion type		Attribute → Name
-Track = /k	Pattern explanation	Leave /k untouched.	Nummer = /k
-Reset	Main action		Zurücksetzen
-Comment = /c	Pattern explanation	Leave /c untouched.	Kommentar = /c
-Add	MPEG operation		Hinzufügen
+Add/Remove	MPEG operation		Hinzufügen/Entfernen
+Year = /y	Pattern explanation	Leave /y untouched.	Jahr = /y
+Drag and drop files here	Empty list		Dateien hier fallen lassen
+Readme	Help menu		Readme
+Quit	File menu		Schließen
+Also apply to attributes	Edit mode operation		Auch auf Attribute anwenden
+Genre	Tag type		Genre
+0 have APE tags	MPEG information		0 haben APE-Tags
+File	File menu		Datei
+0 files in selection	MPEG information		0 Dateien ausgewählt
+Artist = /a	Pattern explanation	Leave /a untouched.	Künstler = /a
+Next file	Edit menu: Selecting files		Nächste Datei
+Next mode	Mode menu		Nächster Modus
+Album = /n	Pattern explanation	Leave /n untouched.	Album = /n
+Edit	Mode menu		Bearbeiten
+MPEG	Mode menu		MPEG
+Attributes → Tags	Conversion type		Attribute → Tags
+Name → Attributes	Conversion type		Name → Attribute
+Also apply to tags	Edit mode operation		Auch auf Tags anwenden
+Year	Tag type		Jahr
+ArmyKnife	System name		ArmyKnife
diff --git a/locales/en.catkeys b/locales/en.catkeys
@@ -1,7 +1,7 @@
-1	English	application/x-vnd.armyknife	2406198119
+1	English	application/x-vnd.armyknife	3052435526
 Info	MPEG information		Info
-Open	File menu		Open
 Copy	Edit menu: Copy/Paste		Copy
+Open	File menu		Open
 Attributes	Edit mode operation		Attributes
 Remove	MPEG operation		Remove
 Copy	Mode menu		Copy
@@ -53,6 +53,7 @@ Wildcard = /*	Pattern explanation	Leave /* untouched.	Wildcard = /*
 Title = /t	Pattern explanation	Leave /t untouched.	Title = /t
 Add/Remove	MPEG operation		Add/Remove
 Year = /y	Pattern explanation	Leave /y untouched.	Year = /y
+Drag and drop files here	Empty list		Drag and drop files here
 Readme	Help menu		Readme
 Quit	File menu		Quit
 Also apply to attributes	Edit mode operation		Also apply to attributes

diff --git a/locales/ja.catkeys b/locales/ja.catkeys
@@ -1,69 +1,74 @@
-1	Japanese	application/x-vnd.armyknife	3412892590
-MPEG	Mode menu		MPEG
-Genre	Tag type		ジャンル
-0 have ID3v1 tags.	MPEG information		0 ID3v1 タグ付
-Reset	Edit menu: Selecting files		初期設定
-No image	Status		画像無し
-Next File	Edit menu: Selecting files		次のファイル
-Last File	Edit menu: Selecting files		末尾のファイル
-Copy	Edit menu: Copy/Paste		コピー
-Pattern:	Pattern label		パターン:
-Tags	Edit mode operation		タグ
-Select All Unsupported	Edit menu: Selecting files		非対応のすべてを選択
-Next Mode	Mode menu		次のモード
-Paste	Edit menu: Copy/Paste		貼り付け
-Online Tag Lookup	Window title		ネットでタグを検索
-Name → Attributes	Conversion type		名前 → 属性
-Year	Tag type		年
+1	English	application/x-vnd.armyknife	3052435526
 Info	MPEG information		情報
-Title	Tag type		曲名
-Excellent	About message	In context, this means \"dismiss\"	お疲れ
-0 have APE tags.	MPEG information		0 APE タグ付
-Select All	Edit menu: Selecting files		すべてを選択
-Album = /n	Pattern explanation	Leave /n untouched.	アルバム = /n
-Previous Mode	Mode menu		前のモード
-Clear List	Edit menu: Selecting files		消去
-Album	Tag type		アルバム
-Quit	File menu		終了
+Copy	Edit menu: Copy/Paste		コピー
+Open	File menu		開く
+Attributes	Edit mode operation		属性
 Remove	MPEG operation		削除
- selected	Main action		 選択中
 Copy	Mode menu		コピー
-0 files in selection.	MPEG information		0 ファイルが選択中。
-About...	File menu		The Army Knife について…
-idle	Status		停止中
-Add/Remove	MPEG operation		追加/削除
-Track	Tag type		トラック
-Working…	Query lookup button		処理中…
+Changelog	Help menu		変更履歴
+Previous file	Edit menu: Selecting files		前のファイル
+Track = /k	Pattern explanation	Leave /k untouched.	トラック = /k
+Select all	Edit menu: Selecting files		すべてを選択
+Cover	Tag type		Cover
+About ArmyKnife	File menu		について ArmyKnife
 Cancel	Main action		中止
-Apply	Main action		適用
-Tags → Attributes	Conversion type		タグ → 属性
-Name	Mode menu		名前
-Also Apply To Attributes	Edit mode operation		属性にも適用
-Show More	Query lookup button		更に表示
-First File	Edit menu: Selecting files		先頭のファイル
-Attributes	Edit mode operation		属性
-Genre = /g	Pattern explanation	Leave /g untouched.	ジャンル = /g
-0 have ID3v2 tags.	MPEG information		0 ID3v2 タグ付
-Year = /y	Pattern explanation	Leave /y untouched.	年 = /y
 No more results	Query lookup button		結果は以上です。
-Previous File	Edit menu: Selecting files		前のファイル
+Artist	Tag type		アーティスト
+Online tag lookup…	Editor view button		ネットでタグを検索…
+Save	Main action		保存
+Online tag lookup	Window title		ネットでタグを検索
+Paste	Edit menu: Copy/Paste		貼り付け
+Add	MPEG operation		追加
+Reset	Edit menu: Selecting files		初期設定
+0 have ID3v1 tags	MPEG information		0 ID3v1 タグ付
+Edit	Edit menu: Copy/Paste		編集
+Select all unsupported	Edit menu: Selecting files		非対応のすべてを選択
+No image	Status		画像無し
+idle	Status		停止中
+Help	Help menu		ヘルプ
+Working…	Query lookup button		処理中…
 Cut	Edit menu: Copy/Paste		切り取り
-Also Apply To Tags	Edit mode operation		タグにも適用
-Edit	Mode menu		編集
+Clear list	Edit menu: Selecting files		消去
+Pattern:	Pattern label		パターン:
 Mode	Mode menu		モード
+Tags	Edit mode operation		タグ
+Comment = /c	Pattern explanation	Leave /c untouched.	コメント = /c
+Show more	Query lookup button		更に表示
+0 have ID3v2 tags	MPEG information		0 ID2v1 タグ付
+Name	Mode menu		名前
+Track	Tag type		トラック
+Previous mode	Mode menu		前のモード
 Add	Main action		追加
-File	File menu		ファイル
-Attributes → Tags	Conversion type		属性 → タグ
+Genre = /g	Pattern explanation	Leave /g untouched.	ジャンル = /g
+Attributes → Name	Conversion type		属性 → 名前
+First file	Edit menu: Selecting files		先頭のファイル
+Title	Tag type		曲名
 Comment	Tag type		コメント
+Tags → Attributes	Conversion type		タグ → 属性
+Last file	Edit menu: Selecting files		末尾のファイル
+Reset	Main action		初期設定
+ selected	Main action		 選択中
+Album	Tag type		アルバム
 Wildcard = /*	Pattern explanation	Leave /* untouched.	ワイルドカード = /*
-Artist	Tag type		アーティスト
-Edit	Edit menu: Copy/Paste		編集
-Online Tag Lookup…	Editor view button		ネットでタグを検索…
-The Army Knife	System name		The Army Knife
-Artist = /a	Pattern explanation	Leave /a untouched.	アーティスト = /a
 Title = /t	Pattern explanation	Leave /t untouched.	曲名 = /t
-Attributes → Name	Conversion type		属性 → 名前
-Track = /k	Pattern explanation	Leave /k untouched.	トラック = /k
-Reset	Main action		初期設定
-Comment = /c	Pattern explanation	Leave /c untouched.	コメント = /c
-Add	MPEG operation		追加
+Add/Remove	MPEG operation		追加/削除
+Year = /y	Pattern explanation	Leave /y untouched.	年 = /y
+Drag and drop files here	Empty list		Drag and drop files here
+Readme	Help menu		Readme
+Quit	File menu		終了
+Also apply to attributes	Edit mode operation		属性にも適用
+Genre	Tag type		ジャンル
+0 have APE tags	MPEG information		0 APE タグ付
+File	File menu		ファイル
+0 files in selection	MPEG information		0 ファイルが選択中。
+Artist = /a	Pattern explanation	Leave /a untouched.	アーティスト = /a
+Next file	Edit menu: Selecting files		次のファイル
+Next mode	Mode menu		次のモード
+Album = /n	Pattern explanation	Leave /n untouched.	アルバム = /n
+Edit	Mode menu		編集
+MPEG	Mode menu		MPEG
+Attributes → Tags	Conversion type		属性 → タグ
+Name → Attributes	Conversion type		名前 → 属性
+Also apply to tags	Edit mode operation		タグにも適用
+Year	Tag type		年
+ArmyKnife	System name		ArmyKnife
diff --git a/source/aklistview.cpp b/source/aklistview.cpp
@@ -4,6 +4,7 @@
  */
 #include "aklistview.h"
 #include "entryrefitem.h"
+#include "guistrings.h"
 
 // AKListView is meant to hold EntryRefItems.
 // EntryRefItem is a subclass of BListItem.
@@ -149,16 +150,19 @@ AKListView::SelectAllUnsupported()
 }
 
 void
-AKListView::NoItem()
+AKListView::Draw(BRect rect)
 {
-	SetDrawingMode(B_OP_OVER);
-	SetHighColor(0,0,0);
-	BFont font;
-	font.SetSize(12.0);
-	SetFont(&font);
-
-	const char* noItemText = "Drag and drop files here";
-	DrawString(noItemText,
-			BPoint(Bounds().Width() / 2 - StringWidth(noItemText) / 2,
-			Bounds().Height() / 2));
+	if (IsEmpty()) {
+		SetDrawingMode(B_OP_OVER);
+		SetHighColor(0,0,0);
+		BFont font;
+		font.SetSize(12.0);
+		SetFont(&font);
+
+		const char* noItemText = DRAG_FILES;
+		DrawString(noItemText,
+				BPoint(Bounds().Width() / 2 - StringWidth(noItemText) / 2,
+				Bounds().Height() / 2));
+	}
+	BListView::Draw(rect);
 }
diff --git a/source/aklistview.h b/source/aklistview.h
@@ -16,6 +16,7 @@ class AKListView : public BListView
 		~AKListView	();
 
 			virtual void	KeyDown(const char* bytes, int32 numBytes);
+			virtual void	Draw(BRect rect);
 
 			virtual void	SelectAll();
 			virtual void	DeselectAll();

diff --git a/source/appview.cpp b/source/appview.cpp
@@ -75,13 +75,6 @@ AppView::SaveWindowFrame()
 	m_preferences->SetWindowFrame(rect);
 }
 
-void
-AppView::Draw(BRect rect)
-{
-	if (m_list_view->CountItems() == 0) {
-		m_list_view->NoItem();
-	}
-}
 
 void
 AppView::InitView()

diff --git a/source/appview.h b/source/appview.h
@@ -39,7 +39,6 @@ class AppView : public BView
 		virtual void MessageReceived(BMessage* message);
 
 		void Apply();
-		void Draw(BRect rect);
 		void Reset();
 		void ClearList();
 		void SelectAll();

diff --git a/source/guistrings.h b/source/guistrings.h
@@ -112,6 +112,7 @@
 #define APPLY_TO_ATTRIBUTES B_TRANSLATE_CONTEXT("Also apply to attributes", "Edit mode operation")
 #define APPLY_TO_TAGS B_TRANSLATE_CONTEXT("Also apply to tags", "Edit mode operation")
 
+#define DRAG_FILES B_TRANSLATE_CONTEXT("Drag and drop files here", "Empty list")
 #define NO_IMAGE B_TRANSLATE_CONTEXT("No image", "Status")
 #define IDLE B_TRANSLATE_CONTEXT("idle", "Status")