Changeset 18404 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Mar 27, 2009 3:13:46 PM (16 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/include/VBoxGLSettingsNetwork.h
r18235 r18404 47 47 48 48 /* Page getters */ 49 QString name() const { return mName; } 49 50 bool isDhcpClientEnabled() const { return mDhcpClientEnabled; } 50 51 QString interfaceAddress() const { return mInterfaceAddress; } … … 81 82 82 83 /* Host-only Interface */ 84 QString mName; 83 85 bool mDhcpClientEnabled; 84 86 QString mInterfaceAddress; -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsNetwork.cpp
r18393 r18404 34 34 : QTreeWidgetItem() 35 35 , mChanged (false) 36 , mName (QString::null) 36 37 , mDhcpClientEnabled (false) 37 38 , mInterfaceAddress (QString::null) … … 52 53 /* Initialization */ 53 54 mInterface = aInterface; 55 mName = mInterface.GetName(); 54 56 CDHCPServer dhcp = vboxGlobal().virtualBox().FindDHCPServerByNetworkName (mInterface.GetNetworkName()); 55 57 if (dhcp.isNull()) vboxGlobal().virtualBox().CreateDHCPServer (mInterface.GetNetworkName()); 56 58 dhcp = vboxGlobal().virtualBox().FindDHCPServerByNetworkName (mInterface.GetNetworkName()); 57 59 AssertMsg (!dhcp.isNull(), ("DHCP Server creation failed!\n")); 58 setText (0, mInterface.GetName());60 setText (0, VBoxGLSettingsNetwork::tr ("%1 network", "<adapter name> network").arg (mName)); 59 61 60 62 /* Host-only Interface settings */ … … 160 162 QHostAddress (mDhcpServerMask).protocol() != QAbstractSocket::IPv4Protocol) 161 163 { 162 aWarning = VBoxGLSettingsNetwork::tr ("DHCP server mask of <b>%1</b> is wrong").arg (text (0));164 aWarning = VBoxGLSettingsNetwork::tr ("DHCP server network mask of <b>%1</b> is wrong").arg (text (0)); 163 165 return false; 164 166 } … … 189 191 190 192 /* Host-only Interface information */ 191 buffer = hdr.arg (VBoxGLSettingsNetwork::tr (" Host Interface"))193 buffer = hdr.arg (VBoxGLSettingsNetwork::tr ("Adapter")) 192 194 .arg (mDhcpClientEnabled ? VBoxGLSettingsNetwork::tr ("Automatically configured", "interface") 193 195 : VBoxGLSettingsNetwork::tr ("Manually configured", "interface")); … … 200 202 .arg (mInterfaceAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address") 201 203 : mInterfaceAddress) + 202 sub.arg (VBoxGLSettingsNetwork::tr ("IPv4 Mask"))204 sub.arg (VBoxGLSettingsNetwork::tr ("IPv4 Network Mask")) 203 205 .arg (mInterfaceMask.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "mask") 204 206 : mInterfaceMask); … … 210 212 .arg (mInterfaceAddress6.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address") 211 213 : mInterfaceAddress6) + 212 sub.arg (VBoxGLSettingsNetwork::tr ("IPv6 Mask Length"))214 sub.arg (VBoxGLSettingsNetwork::tr ("IPv6 Network Mask Length")) 213 215 .arg (mInterfaceMaskLength6.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "length") 214 216 : mInterfaceMaskLength6); … … 229 231 .arg (mDhcpServerAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address") 230 232 : mDhcpServerAddress) + 231 sub.arg (VBoxGLSettingsNetwork::tr (" Mask"))233 sub.arg (VBoxGLSettingsNetwork::tr ("Network Mask")) 232 234 .arg (mDhcpServerMask.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "mask") 233 235 : mDhcpServerMask) + … … 428 430 NetworkItem *item = static_cast <NetworkItem*> (mTwInterfaces->currentItem()); 429 431 AssertMsg (item, ("Current item should be selected!\n")); 430 QString name (item-> text (0));432 QString name (item->name()); 431 433 432 434 /* Asking user about deleting selected network interface */ -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp
r18381 r18404 202 202 { 203 203 QString name (mDetails->currentName (type)); 204 info += line.arg (tr (" Interface", "network"))205 .arg (name.isEmpty() ? tr ("Not selected", " interface") : name);204 info += line.arg (tr ("Adapter", "network")) 205 .arg (name.isEmpty() ? tr ("Not selected", "adapter") : name); 206 206 break; 207 207 } -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetworkDetails.cpp
r18235 r18404 167 167 if (currentName (aType).isNull()) 168 168 { 169 aWarning = tr ("no host-only interfaceis selected");169 aWarning = tr ("no host-only adapter is selected"); 170 170 return false; 171 171 } -
trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGLSettingsNetwork.ui
r18393 r18404 48 48 <widget class="QLabel" name="mLbPageName"> 49 49 <property name="text"> 50 <string>&Host-only Networks List:</string>50 <string>&Host-only Networks:</string> 51 51 </property> 52 52 <property name="buddy"> -
trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGLSettingsNetworkDetails.ui
r18235 r18404 44 44 <widget class="QWidget" name="mTabInterface" > 45 45 <attribute name="title" > 46 <string> Host-only &Interface</string>46 <string>&Adapter</string> 47 47 </attribute> 48 48 <layout class="QGridLayout" > … … 50 50 <widget class="QCheckBox" name="mCbManual" > 51 51 <property name="text" > 52 <string> &ManualConfiguration</string>52 <string>Manual &Configuration</string> 53 53 </property> 54 54 <property name="checked" > … … 56 56 </property> 57 57 <property name="toolTip" > 58 <string>Use manual configuration for this host-only network interface.</string>58 <string>Use manual configuration for this host-only network adapter.</string> 59 59 </property> 60 60 </widget> … … 63 63 <widget class="QLabel" name="mLbIPv4" > 64 64 <property name="text" > 65 <string> IPv4 &Address:</string>65 <string>&IPv4 Address:</string> 66 66 </property> 67 67 <property name="alignment" > … … 82 82 </property> 83 83 <property name="toolTip" > 84 <string>Displays the host IPv4 address for this interface.</string>84 <string>Displays the host IPv4 address for this adapter.</string> 85 85 </property> 86 86 </widget> … … 89 89 <widget class="QLabel" name="mLbNMv4" > 90 90 <property name="text" > 91 <string>IPv4 Network Ma&sk:</string>91 <string>IPv4 Network &Mask:</string> 92 92 </property> 93 93 <property name="alignment" > … … 108 108 </property> 109 109 <property name="toolTip" > 110 <string>Displays the host IPv4 network mask for this interface.</string>110 <string>Displays the host IPv4 network mask for this adapter.</string> 111 111 </property> 112 112 </widget> … … 115 115 <widget class="QLabel" name="mLbIPv6" > 116 116 <property name="text" > 117 <string>I Pv6 Add&ress:</string>117 <string>I&Pv6 Address:</string> 118 118 </property> 119 119 <property name="alignment" > … … 134 134 </property> 135 135 <property name="toolTip" > 136 <string>Displays the host IPv6 address for this interface if IPv6 protocolis supported.</string>136 <string>Displays the host IPv6 address for this adapter if IPv6 is supported.</string> 137 137 </property> 138 138 </widget> … … 141 141 <widget class="QLabel" name="mLbNMv6" > 142 142 <property name="text" > 143 <string>IPv6 Network Mask L&ength:</string>143 <string>IPv6 Network Mask &Length:</string> 144 144 </property> 145 145 <property name="alignment" > … … 160 160 </property> 161 161 <property name="toolTip" > 162 <string>Displays the host IPv6 network mask prefix length for this interface if IPv6 protocolis supported.</string>162 <string>Displays the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</string> 163 163 </property> 164 164 </widget> … … 197 197 <widget class="QLabel" name="mLbDhcpAddress" > 198 198 <property name="text" > 199 <string>Server &Address:</string>199 <string>Server Add&ress:</string> 200 200 </property> 201 201 <property name="alignment" > … … 216 216 </property> 217 217 <property name="toolTip" > 218 <string>Displays the address of DHCP server for internal network based on this host-only interface.</string>218 <string>Displays the address of the DHCP server servicing the network associated with this host-only adapter.</string> 219 219 </property> 220 220 </widget> … … 242 242 </property> 243 243 <property name="toolTip" > 244 <string>Displays the network mask of DHCP server for internal network based on this host-only interface.</string>244 <string>Displays the network mask of the DHCP server servicing the network associated with this host-only adapter.</string> 245 245 </property> 246 246 </widget> … … 268 268 </property> 269 269 <property name="toolTip" > 270 <string>Displays the lower address presented by DHCP server for internal network based on this host-only interface.</string>270 <string>Displays the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</string> 271 271 </property> 272 272 </widget> … … 294 294 </property> 295 295 <property name="toolTip" > 296 <string>Displays the upper address presented by DHCP server for internal network based on this host-only interface.</string>296 <string>Displays the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</string> 297 297 </property> 298 298 </widget> -
trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsNetworkDetails.ui
r18235 r18404 99 99 <widget class="QLabel" name="mLbHOI" > 100 100 <property name="text" > 101 <string>Host-only &Network Interface:</string>101 <string>Host-only &Network Adapter:</string> 102 102 </property> 103 103 <property name="alignment" > … … 118 118 </property> 119 119 <property name="toolTip" > 120 <string>Displays the name of the VirtualBox network interfaceselected for host-only networking.</string>120 <string>Displays the name of the VirtualBox network adapter selected for host-only networking.</string> 121 121 </property> 122 122 </widget>
Note:
See TracChangeset
for help on using the changeset viewer.