renamed classes and filenames as per recommendations on ML; Interface singular for interface config; Interfaces plural for overall views/windows dealing with lists of interfaces; avoid using generic terms and abbreviations
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40498 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+4
-4
@@ -6,7 +6,7 @@
|
|||||||
* Alexander von Gluck, kallisti5@unixzen.com
|
* Alexander von Gluck, kallisti5@unixzen.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "SettingsIfView.h"
|
#include "InterfaceAddressView.h"
|
||||||
#include "NetworkSettings.h"
|
#include "NetworkSettings.h"
|
||||||
|
|
||||||
#include <GroupLayout.h>
|
#include <GroupLayout.h>
|
||||||
@@ -14,8 +14,8 @@
|
|||||||
#include <StringView.h>
|
#include <StringView.h>
|
||||||
|
|
||||||
|
|
||||||
SettingsIfView::SettingsIfView(BRect frame, const char* name, int family,
|
InterfaceAddressView::InterfaceAddressView(BRect frame, const char* name,
|
||||||
NetworkSettings* settings)
|
int family, NetworkSettings* settings)
|
||||||
:
|
:
|
||||||
BView(frame, name, B_FOLLOW_ALL_SIDES, 0),
|
BView(frame, name, B_FOLLOW_ALL_SIDES, 0),
|
||||||
fSettings(settings),
|
fSettings(settings),
|
||||||
@@ -36,7 +36,7 @@ SettingsIfView::SettingsIfView(BRect frame, const char* name, int family,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SettingsIfView::~SettingsIfView()
|
InterfaceAddressView::~InterfaceAddressView()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
+8
-7
@@ -6,8 +6,8 @@
|
|||||||
* Alexander von Gluck, kallisti5@unixzen.com
|
* Alexander von Gluck, kallisti5@unixzen.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SETTINGS_IFVIEW_H
|
#ifndef INTERFACE_ADDRESS_VIEW_H
|
||||||
#define SETTINGS_IFVIEW_H
|
#define INTERFACE_ADDRESS_VIEW_H
|
||||||
|
|
||||||
#include "NetworkSettings.h"
|
#include "NetworkSettings.h"
|
||||||
|
|
||||||
@@ -15,11 +15,12 @@
|
|||||||
#include <View.h>
|
#include <View.h>
|
||||||
|
|
||||||
|
|
||||||
class SettingsIfView : public BView {
|
class InterfaceAddressView : public BView {
|
||||||
public:
|
public:
|
||||||
SettingsIfView(BRect frame, const char* name,
|
InterfaceAddressView(BRect frame,
|
||||||
int family, NetworkSettings* settings);
|
const char* name, int family,
|
||||||
virtual ~SettingsIfView();
|
NetworkSettings* settings);
|
||||||
|
virtual ~InterfaceAddressView();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
NetworkSettings* fSettings;
|
NetworkSettings* fSettings;
|
||||||
@@ -27,5 +28,5 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* SETTINGS_IFVIEW_H */
|
#endif /* INTERFACE_ADDRESS_VIEW_H */
|
||||||
|
|
||||||
+9
-9
@@ -7,8 +7,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "SettingsWindow.h"
|
#include "InterfaceWindow.h"
|
||||||
#include "SettingsIfView.h"
|
#include "InterfaceAddressView.h"
|
||||||
|
|
||||||
#include <Application.h>
|
#include <Application.h>
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
#define B_TRANSLATE_CONTEXT "NetworkSetupWindow"
|
#define B_TRANSLATE_CONTEXT "NetworkSetupWindow"
|
||||||
|
|
||||||
|
|
||||||
SettingsWindow::SettingsWindow(NetworkSettings* settings)
|
InterfaceWindow::InterfaceWindow(NetworkSettings* settings)
|
||||||
: BWindow(BRect(50, 50, 400, 302), "Interface Settings",
|
: BWindow(BRect(50, 50, 400, 302), "Interface Settings",
|
||||||
B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
|
B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
|
||||||
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE,
|
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE,
|
||||||
@@ -51,13 +51,13 @@ SettingsWindow::SettingsWindow(NetworkSettings* settings)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SettingsWindow::~SettingsWindow()
|
InterfaceWindow::~InterfaceWindow()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
SettingsWindow::MessageReceived(BMessage* message)
|
InterfaceWindow::MessageReceived(BMessage* message)
|
||||||
{
|
{
|
||||||
switch (message->what) {
|
switch (message->what) {
|
||||||
default:
|
default:
|
||||||
@@ -68,12 +68,12 @@ SettingsWindow::MessageReceived(BMessage* message)
|
|||||||
|
|
||||||
|
|
||||||
status_t
|
status_t
|
||||||
SettingsWindow::_PopulateTabs()
|
InterfaceWindow::_PopulateTabs()
|
||||||
{
|
{
|
||||||
BRect frame = fTabView->Bounds();
|
BRect frame = fTabView->Bounds();
|
||||||
BView* view4 = new SettingsIfView(frame, "net_settings_ipv4",
|
BView* view4 = new InterfaceAddressView(frame, "net_settings_ipv4",
|
||||||
AF_INET, fNetworkSettings);
|
AF_INET, fNetworkSettings);
|
||||||
BView* view6 = new SettingsIfView(frame, "net_settings_ipv6",
|
BView* view6 = new InterfaceAddressView(frame, "net_settings_ipv6",
|
||||||
AF_INET6, fNetworkSettings);
|
AF_INET6, fNetworkSettings);
|
||||||
|
|
||||||
BTab* tab4 = new BTab;
|
BTab* tab4 = new BTab;
|
||||||
@@ -90,7 +90,7 @@ SettingsWindow::_PopulateTabs()
|
|||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SettingsWindow::QuitRequested()
|
InterfaceWindow::QuitRequested()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
+6
-6
@@ -7,8 +7,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef SETTINGS_WINDOW_H
|
#ifndef INTERFACE_WINDOW_H
|
||||||
#define SETTINGS_WINDOW_H
|
#define INTERFACE_WINDOW_H
|
||||||
|
|
||||||
#include "NetworkSettings.h"
|
#include "NetworkSettings.h"
|
||||||
|
|
||||||
@@ -26,10 +26,10 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class SettingsWindow : public BWindow {
|
class InterfaceWindow : public BWindow {
|
||||||
public:
|
public:
|
||||||
SettingsWindow(NetworkSettings* settings);
|
InterfaceWindow(NetworkSettings* settings);
|
||||||
virtual ~SettingsWindow();
|
virtual ~InterfaceWindow();
|
||||||
virtual bool QuitRequested();
|
virtual bool QuitRequested();
|
||||||
virtual void MessageReceived(BMessage* mesage);
|
virtual void MessageReceived(BMessage* mesage);
|
||||||
|
|
||||||
@@ -43,5 +43,5 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* SETTINGS_WINDOW_H */
|
#endif /* INTERFACE_WINDOW_H */
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#include "InterfacesAddOn.h"
|
#include "InterfacesAddOn.h"
|
||||||
#include "InterfacesListView.h"
|
#include "InterfacesListView.h"
|
||||||
#include "SettingsWindow.h"
|
#include "InterfaceWindow.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ InterfacesAddOn::MessageReceived(BMessage* msg)
|
|||||||
if (!item)
|
if (!item)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
SettingsWindow* sw = new SettingsWindow(item->GetSettings());
|
InterfaceWindow* sw = new InterfaceWindow(item->GetSettings());
|
||||||
sw->Show();
|
sw->Show();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ Addon Interfaces :
|
|||||||
InterfacesAddOn.cpp
|
InterfacesAddOn.cpp
|
||||||
InterfacesListView.cpp
|
InterfacesListView.cpp
|
||||||
NetworkSettings.cpp
|
NetworkSettings.cpp
|
||||||
SettingsWindow.cpp
|
InterfaceWindow.cpp
|
||||||
SettingsIfView.cpp
|
InterfaceAddressView.cpp
|
||||||
|
|
||||||
# from src/apps/networkstatus
|
# from src/apps/networkstatus
|
||||||
RadioView.cpp
|
RadioView.cpp
|
||||||
|
|||||||
Reference in New Issue
Block a user