Reorganize gtk and localization files

This commit is contained in:
zvon 2020-04-01 16:07:37 +02:00
parent adf4a11874
commit aa049ff203
17 changed files with 36 additions and 36 deletions

View File

@ -15,7 +15,7 @@ default: tv_rename
.PHONY: clean .PHONY: clean
clean: clean:
rm -f *.o tv_rename tv_rename_gui rm -Rf *.o tv_rename tv_rename_gui locale
.PHONY: install .PHONY: install
install: tv_rename install: tv_rename
@ -81,26 +81,26 @@ tv_rename_gui: $(GUIOBJECTS) $(LOCALES)
strip tv_rename_gui strip tv_rename_gui
filesystem_u_gui.o: unix/filesystem.cpp filesystem_u_gui.o: unix/filesystem.cpp
$(CXX) $(CFLAGS) -c unix/filesystem.cpp -o filesystem_u_gui.o -DGUI $(CXX) $(CFLAGS) -c $^ -o filesystem_u_gui.o -DGUI
functions_gui.o: functions.cpp functions_gui.o: functions.cpp
$(CXX) $(CFLAGS) -c functions.cpp -o functions_gui.o -DGUI $(CXX) $(CFLAGS) -c $^ -o functions_gui.o -DGUI
tv_rename_gui.o: tv_rename.cpp tv_rename_gui.o: tv_rename.cpp
$(CXX) $(CFLAGS) -c tv_rename.cpp -o tv_rename_gui.o -DGUI $(CXX) $(CFLAGS) -c $^ -o tv_rename_gui.o -DGUI
gui.o: gui.cpp gui.o: gtk/gui.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
mainwindow.o: mainwindow.cpp mainwindow.o: gtk/mainwindow.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
seasonwindow.o: seasonwindow.cpp seasonwindow.o: gtk/seasonwindow.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
databasewindow.o: databasewindow.cpp databasewindow.o: gtk/databasewindow.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
searchwindow.o: searchwindow.cpp searchwindow.o: gtk/searchwindow.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
gtkfunctions.o: gtkfunctions.cpp gtkfunctions.o: gtk/gtkfunctions.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
progress_gui.o: progress.cpp progress_gui.o: progress.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
progresswindow.o: progresswindow.cpp progresswindow.o: gtk/progresswindow.cpp
$(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI $(CXX) $(CFLAGS) -o $@ -c $^ $(GTKFLAGS) -DGUI
.PHONY: windows .PHONY: windows
@ -138,6 +138,6 @@ tv_rename_stringtable.res: tv_rename_stringtable.rc
locale/%/LC_MESSAGES: locale/%/LC_MESSAGES:
mkdir -p $@ mkdir -p $@
locale/%/LC_MESSAGES/tv_rename.mo: %.po locale/%/LC_MESSAGES locale/%/LC_MESSAGES/tv_rename.mo: translations/%.po locale/%/LC_MESSAGES
msgfmt -c $< -o $<.mo msgfmt -c $< -o $<.mo
mv $<.mo $@ mv $<.mo $@

View File

@ -8,12 +8,12 @@
#include <thread> #include <thread>
#include "databasewindow.hpp" #include "databasewindow.hpp"
#include "filesystem.hpp"
#include "functions.hpp"
#include "gtkfunctions.hpp" #include "gtkfunctions.hpp"
#include "progresswindow.hpp" #include "progresswindow.hpp"
#include "resources_linux.h" #include "../filesystem.hpp"
#include "tv_rename.hpp" #include "../functions.hpp"
#include "../resources_linux.h"
#include "../tv_rename.hpp"
DatabaseWindow::~DatabaseWindow() { DatabaseWindow::~DatabaseWindow() {
auto children = get_children(); auto children = get_children();

View File

@ -3,9 +3,9 @@
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
#include <gtkmm/messagedialog.h> #include <gtkmm/messagedialog.h>
#include "functions.hpp" #include "../functions.hpp"
#include "resources_linux.h" #include "../resources_linux.h"
#include "tv_rename.hpp" #include "../tv_rename.hpp"
void searchShow( Gtk::Entry *entry_show, Gtk::ComboBox *combo_possible, void searchShow( Gtk::Entry *entry_show, Gtk::ComboBox *combo_possible,
const Gtk::TreeModelColumn< std::string > &col_show, const Gtk::TreeModelColumn< std::string > &col_show,

View File

@ -1,14 +1,14 @@
#include "functions.hpp"
#include <errno.h> #include <errno.h>
#include <error.h> #include <error.h>
#include <gtkmm/application.h> #include <gtkmm/application.h>
#include <libintl.h> #include <libintl.h>
#include <locale.h> #include <locale.h>
#include "filesystem.hpp"
#include "mainwindow.hpp" #include "mainwindow.hpp"
#include "resources_linux.h" #include "../filesystem.hpp"
#include "tv_rename.hpp" #include "../functions.hpp"
#include "../resources_linux.h"
#include "../tv_rename.hpp"
#define API_KEY "42B66F5E-C6BF-423F-ADF9-CC97163472F6" #define API_KEY "42B66F5E-C6BF-423F-ADF9-CC97163472F6"
#define DOMAIN "tv_rename" #define DOMAIN "tv_rename"

View File

@ -9,13 +9,13 @@
#include <thread> #include <thread>
#include "databasewindow.hpp" #include "databasewindow.hpp"
#include "filesystem.hpp"
#include "functions.hpp"
#include "gtkfunctions.hpp" #include "gtkfunctions.hpp"
#include "mainwindow.hpp" #include "mainwindow.hpp"
#include "progresswindow.hpp" #include "progresswindow.hpp"
#include "resources_linux.h" #include "../filesystem.hpp"
#include "tv_rename.hpp" #include "../functions.hpp"
#include "../resources_linux.h"
#include "../tv_rename.hpp"
void MainWindow::chooseFile() { void MainWindow::chooseFile() {
// create a dialog for choosing directory // create a dialog for choosing directory

View File

@ -14,8 +14,8 @@
#include <gtkmm/window.h> #include <gtkmm/window.h>
#include <set> #include <set>
#include "network.hpp"
#include "seasonwindow.hpp" #include "seasonwindow.hpp"
#include "../network.hpp"
class MainWindow : public Gtk::Window { class MainWindow : public Gtk::Window {
public: public:

View File

@ -1,9 +1,9 @@
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
#include <mutex> #include <mutex>
#include "functions.hpp"
#include "progresswindow.hpp" #include "progresswindow.hpp"
#include "resources_linux.h" #include "../functions.hpp"
#include "../resources_linux.h"
ProgressWindow::ProgressWindow() { ProgressWindow::ProgressWindow() {
set_title( _( GUI_WINDOW_PROGRESS ) ); set_title( _( GUI_WINDOW_PROGRESS ) );

View File

@ -4,11 +4,11 @@
#include <gtkmm/messagedialog.h> #include <gtkmm/messagedialog.h>
#include <iostream> #include <iostream>
#include "functions.hpp"
#include "gtkfunctions.hpp" #include "gtkfunctions.hpp"
#include "resources_linux.h"
#include "searchwindow.hpp" #include "searchwindow.hpp"
#include "tv_rename.hpp" #include "../functions.hpp"
#include "../resources_linux.h"
#include "../tv_rename.hpp"
void SearchWindow::search() { void SearchWindow::search() {
language_code = language_code =

View File

@ -1,8 +1,8 @@
#include "seasonwindow.hpp" #include "seasonwindow.hpp"
#include <string> #include <string>
#include "functions.hpp" #include "../functions.hpp"
#include "resources_linux.h" #include "../resources_linux.h"
void SeasonWindow::confirm() { void SeasonWindow::confirm() {
// go through all checkbuttons and save numbers // go through all checkbuttons and save numbers

View File

@ -17,7 +17,7 @@
#else // UNIX #else // UNIX
#ifdef GUI #ifdef GUI
#include "progresswindow.hpp" #include "gtk/progresswindow.hpp"
#endif // GUI #endif // GUI
#include <sys/ioctl.h> #include <sys/ioctl.h>