diff --git a/Applications/ProcessManager/GraphWidget.cpp b/Applications/SystemMonitor/GraphWidget.cpp similarity index 100% rename from Applications/ProcessManager/GraphWidget.cpp rename to Applications/SystemMonitor/GraphWidget.cpp diff --git a/Applications/ProcessManager/GraphWidget.h b/Applications/SystemMonitor/GraphWidget.h similarity index 100% rename from Applications/ProcessManager/GraphWidget.h rename to Applications/SystemMonitor/GraphWidget.h diff --git a/Applications/ProcessManager/Makefile b/Applications/SystemMonitor/Makefile similarity index 93% rename from Applications/ProcessManager/Makefile rename to Applications/SystemMonitor/Makefile index e91f1d3a69..9c760c378b 100644 --- a/Applications/ProcessManager/Makefile +++ b/Applications/SystemMonitor/Makefile @@ -11,6 +11,6 @@ OBJS = \ NetworkStatisticsWidget.o \ main.o -APP = ProcessManager +APP = SystemMonitor include ../Makefile.common diff --git a/Applications/ProcessManager/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp similarity index 100% rename from Applications/ProcessManager/MemoryStatsWidget.cpp rename to Applications/SystemMonitor/MemoryStatsWidget.cpp diff --git a/Applications/ProcessManager/MemoryStatsWidget.h b/Applications/SystemMonitor/MemoryStatsWidget.h similarity index 100% rename from Applications/ProcessManager/MemoryStatsWidget.h rename to Applications/SystemMonitor/MemoryStatsWidget.h diff --git a/Applications/ProcessManager/NetworkStatisticsWidget.cpp b/Applications/SystemMonitor/NetworkStatisticsWidget.cpp similarity index 100% rename from Applications/ProcessManager/NetworkStatisticsWidget.cpp rename to Applications/SystemMonitor/NetworkStatisticsWidget.cpp diff --git a/Applications/ProcessManager/NetworkStatisticsWidget.h b/Applications/SystemMonitor/NetworkStatisticsWidget.h similarity index 100% rename from Applications/ProcessManager/NetworkStatisticsWidget.h rename to Applications/SystemMonitor/NetworkStatisticsWidget.h diff --git a/Applications/ProcessManager/ProcessFileDescriptorMapWidget.cpp b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp similarity index 100% rename from Applications/ProcessManager/ProcessFileDescriptorMapWidget.cpp rename to Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp diff --git a/Applications/ProcessManager/ProcessFileDescriptorMapWidget.h b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h similarity index 100% rename from Applications/ProcessManager/ProcessFileDescriptorMapWidget.h rename to Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h diff --git a/Applications/ProcessManager/ProcessMemoryMapWidget.cpp b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp similarity index 100% rename from Applications/ProcessManager/ProcessMemoryMapWidget.cpp rename to Applications/SystemMonitor/ProcessMemoryMapWidget.cpp diff --git a/Applications/ProcessManager/ProcessMemoryMapWidget.h b/Applications/SystemMonitor/ProcessMemoryMapWidget.h similarity index 100% rename from Applications/ProcessManager/ProcessMemoryMapWidget.h rename to Applications/SystemMonitor/ProcessMemoryMapWidget.h diff --git a/Applications/ProcessManager/ProcessModel.cpp b/Applications/SystemMonitor/ProcessModel.cpp similarity index 100% rename from Applications/ProcessManager/ProcessModel.cpp rename to Applications/SystemMonitor/ProcessModel.cpp diff --git a/Applications/ProcessManager/ProcessModel.h b/Applications/SystemMonitor/ProcessModel.h similarity index 100% rename from Applications/ProcessManager/ProcessModel.h rename to Applications/SystemMonitor/ProcessModel.h diff --git a/Applications/ProcessManager/ProcessStacksWidget.cpp b/Applications/SystemMonitor/ProcessStacksWidget.cpp similarity index 100% rename from Applications/ProcessManager/ProcessStacksWidget.cpp rename to Applications/SystemMonitor/ProcessStacksWidget.cpp diff --git a/Applications/ProcessManager/ProcessStacksWidget.h b/Applications/SystemMonitor/ProcessStacksWidget.h similarity index 100% rename from Applications/ProcessManager/ProcessStacksWidget.h rename to Applications/SystemMonitor/ProcessStacksWidget.h diff --git a/Applications/ProcessManager/ProcessTableView.cpp b/Applications/SystemMonitor/ProcessTableView.cpp similarity index 100% rename from Applications/ProcessManager/ProcessTableView.cpp rename to Applications/SystemMonitor/ProcessTableView.cpp diff --git a/Applications/ProcessManager/ProcessTableView.h b/Applications/SystemMonitor/ProcessTableView.h similarity index 100% rename from Applications/ProcessManager/ProcessTableView.h rename to Applications/SystemMonitor/ProcessTableView.h diff --git a/Applications/ProcessManager/main.cpp b/Applications/SystemMonitor/main.cpp similarity index 98% rename from Applications/ProcessManager/main.cpp rename to Applications/SystemMonitor/main.cpp index 6361f342b6..de3de2f8db 100644 --- a/Applications/ProcessManager/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -129,7 +129,7 @@ int main(int argc, char** argv) toolbar->add_action(continue_action); auto menubar = make(); - auto app_menu = make("Process Manager"); + auto app_menu = make("System Monitor"); app_menu->add_action(GAction::create("Quit", { Mod_Alt, Key_F4 }, [](const GAction&) { GApplication::the().quit(0); return; @@ -195,13 +195,13 @@ int main(int argc, char** argv) }; auto* window = new GWindow; - window->set_title("Process Manager"); + window->set_title("System Monitor"); window->set_rect(20, 200, 680, 400); window->set_main_widget(keeper); window->show(); - window->set_icon(load_png("/res/icons/16x16/app-process-manager.png")); + window->set_icon(load_png("/res/icons/16x16/app-system-monitor.png")); return app.exec(); } diff --git a/Base/home/anon/Launcher.ini b/Base/home/anon/Launcher.ini index dba5a9a6a8..c57fd34ec0 100644 --- a/Base/home/anon/Launcher.ini +++ b/Base/home/anon/Launcher.ini @@ -29,9 +29,9 @@ Icon=/res/icons/32x32/app-minesweeper.png Path=/bin/Snake Icon=/res/icons/32x32/app-snake.png -[ProcessManager] -Path=/bin/ProcessManager -Icon=/res/icons/32x32/app-process-manager.png +[SystemMonitor] +Path=/bin/SystemMonitor +Icon=/res/icons/32x32/app-system-monitor.png [PaintBrush] Path=/bin/PaintBrush diff --git a/Base/res/icons/16x16/app-process-manager.png b/Base/res/icons/16x16/app-system-monitor.png similarity index 100% rename from Base/res/icons/16x16/app-process-manager.png rename to Base/res/icons/16x16/app-system-monitor.png diff --git a/Base/res/icons/32x32/app-process-manager.png b/Base/res/icons/32x32/app-system-monitor.png similarity index 100% rename from Base/res/icons/32x32/app-process-manager.png rename to Base/res/icons/32x32/app-system-monitor.png diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh index 38921ec207..903231b569 100755 --- a/Kernel/build-root-filesystem.sh +++ b/Kernel/build-root-filesystem.sh @@ -75,7 +75,7 @@ cp ../Applications/FileManager/FileManager mnt/bin/FileManager cp ../Applications/FontEditor/FontEditor mnt/bin/FontEditor cp ../Applications/IRCClient/IRCClient mnt/bin/IRCClient cp ../Applications/Launcher/Launcher mnt/bin/Launcher -cp ../Applications/ProcessManager/ProcessManager mnt/bin/ProcessManager +cp ../Applications/SystemMonitor/SystemMonitor mnt/bin/SystemMonitor cp ../Applications/Taskbar/Taskbar mnt/bin/Taskbar cp ../Applications/Terminal/Terminal mnt/bin/Terminal cp ../Applications/TextEditor/TextEditor mnt/bin/TextEditor diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index 07fc9d97c9..58ef6ef58d 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -36,7 +36,7 @@ build_targets="$build_targets ../Applications/Terminal" build_targets="$build_targets ../Applications/FontEditor" build_targets="$build_targets ../Applications/Launcher" build_targets="$build_targets ../Applications/FileManager" -build_targets="$build_targets ../Applications/ProcessManager" +build_targets="$build_targets ../Applications/SystemMonitor" build_targets="$build_targets ../Applications/TextEditor" build_targets="$build_targets ../Applications/About" build_targets="$build_targets ../Applications/IRCClient"