Use %ifplugin tabs

k-meleon/default/profile/accel.cfg

@@ -13,8 +13,8 @@
 
 
 # Middle-click links to the background:
-#%ifplugin layers
-#MButton = layers(OpenLinkBg) 
+#%ifplugin tabs
+#MButton = ID_OPEN_LINK_IN_BACKGROUNDTAB
 #%else
 #MButton = ID_OPEN_LINK_IN_BACKGROUND
 #%endif

k-meleon/default/settings/accel.cfg

@@ -8,18 +8,35 @@
 
 # ----- Link Handling
 
-# Middle-click links to new tabs:
+# Middle-click links to new windows/tabs:
+%ifplugin tabs
 MButton = ID_OPEN_LINK_IN_NEW_TAB
+%else
+MButton = ID_OPEN_LINK_IN_NEW_WINDOW
+%endif
 
 # Middle-click links to the background (instead of the above):
+#%ifplugin tabs
 #MButton = ID_OPEN_LINK_IN_BACKGROUNDTAB
+#%else
+#MButton = ID_OPEN_LINK_IN_BACKGROUND
+#%endif
 
 # Ctrl+Left-click and Shift+Left-click links to new windows/tabs:
+%ifplugin tabs
 CTRL LButton = ID_OPEN_LINK_IN_NEW_TAB
 SHIFT LButton = ID_OPEN_LINK_IN_NEW_WINDOW
+%else
+CTRL LButton = ID_OPEN_LINK_IN_NEW_WINDOW
+SHIFT LButton = ID_OPEN_LINK_IN_NEW_WINDOW
+%endif
 
 # Ctrl+Right-click links to to the background:
+%ifplugin tabs
 CTRL RButton = ID_OPEN_LINK_IN_BACKGROUNDTAB
+%else
+CTRL RButton = ID_OPEN_LINK_IN_BACKGROUND
+%endif
 
 # Alt+Left-click link urls to the clipboard for download managers to catch them:
 ALT LButton = ID_COPY_LINK_LOCATION
@@ -28,19 +45,26 @@ ALT LButton = ID_COPY_LINK_LOCATION
 # ----- Window/Tab Handling
 
 #ALT VK_F4 = ID_FILE_CLOSE
-
-SHIFT VK_F4 = ID_CLOSE_ALLOTHERTAB
+%ifplugin tabs
 CTRL VK_F4 = ID_CLOSE_TAB
 CTRL SHIFT VK_F4 = ID_CLOSE_ALLTAB
+SHIFT VK_F4 = ID_CLOSE_ALLOTHERTAB
+%endif
 CTRL ALT VK_F4 = ID_APP_EXIT
 
+%ifplugin tabs
 CTRL VK_TAB = ID_TAB_NEXT
 CTRL SHIFT VK_TAB = ID_TAB_PREV
+%else
+CTRL VK_TAB = ID_WINDOW_NEXT
+CTRL SHIFT VK_TAB = ID_WINDOW_PREV
+%endif
 
-CTRL VK_NEXT = ID_TAB_NEXT
+%ifplugin tabs
 CTRL VK_PRIOR  = ID_TAB_PREV
-
+CTRL VK_NEXT = ID_TAB_NEXT
 CTRL ALT VK_TAB = ID_TAB_LAST
+%endif
 
 CTRL VK_F7 = ID_WINDOW_NEXT
 CTRL SHIFT VK_F7 = ID_WINDOW_PREV
@@ -96,23 +120,31 @@ CTRL O = ID_FILE_OPEN
 CTRL P = ID_FILE_PRINT
 CTRL R = ID_NAV_RELOAD
 CTRL S = ID_FILE_SAVE_AS
+%ifplugin tabs
 CTRL T = ID_NEW_TAB
+%endif
 CTRL U = ID_VIEW_SOURCE
 #CTRL V = ID_EDIT_PASTE
+%ifplugin tabs
 CTRL W = ID_CLOSE_TAB
-
+%else
+CTRL W = ID_FILE_CLOSE
+%endif
 #CTRL X = ID_EDIT_CUT
 #CTRL Z = ID_EDIT_UNDO
 
 CTRL ALT P = ID_FILE_PRINTPREVIEW
+%ifplugin tabs
 CTRL ALT W = ID_CLOSE_ALLOTHERTAB
+%endif
 %ifplugin sessions
 CTRL ALT Z = sessions(Undo)
 %endif
 
 CTRL SHIFT R = ID_NAV_FORCE_RELOAD
+%ifplugin tabs
 CTRL SHIFT W = ID_CLOSE_ALLTAB
-
+%endif
 
 # Zoom
 CTRL VK_PLUS = ID_FONT_INCREASE

k-meleon/default/settings/menus.cfg

@@ -70,6 +70,7 @@ history()
 
 # ----- Tabs/Windows
 
+%ifplugin tabs
 CloseTab{
 C&lose Tab=ID_CLOSE_TAB
 Close All Ta&bs=ID_CLOSE_ALLTAB
@@ -86,6 +87,7 @@ Previously Sele&cted Tab=ID_TAB_LAST
 T&abs{
 @TabList
 }
+%endif
 &Windows{
 @WindowList
 }
@@ -152,26 +154,32 @@ Page Set&up=ID_FILE_PRINTSETUP
 # ----- Tab/Window Buttons
 
 Prev{
+%ifplugin tabs
 Previ&ous Tab=ID_TAB_PREV
 Previously Sele&cted Tab=ID_TAB_LAST
 @TabList
 -
+%endif
 Pre&vious Window=ID_WINDOW_PREV
 @WindowList
 #bmpmenu()
 }
 
 Next{
+%ifplugin tabs
 N&ext Tab=ID_TAB_NEXT
 @TabList
 -
+%endif
 Ne&xt Window=ID_WINDOW_NEXT
 @WindowList
 #bmpmenu()
 }
 
 New{
+%ifplugin tabs
 New &Tab=ID_NEW_TAB
+%endif
 &New Window=ID_NEW_BROWSER
 #bmpmenu()
 }
@@ -181,7 +189,9 @@ CloseWindow{
 Exit &K-Meleon=ID_APP_EXIT
 }
 Close{
+%ifplugin tabs
 !CloseTab
+%endif
 !CloseWindow
 #bmpmenu()
 }
@@ -250,7 +260,9 @@ Open &Home Page=ID_NAV_HOME
 %ifplugin history
 :Histor&y
 %endif
+%ifplugin tabs
 :T&abs
+%endif
 :&Windows
 }
 PageDisplay{
@@ -375,6 +387,7 @@ Compact Menu{
 
 # ----- Tabs
 
+%ifplugin tabs
 TabButtonPopup{
 !New
 !CloseTab
@@ -382,6 +395,7 @@ TabButtonPopup{
 -
 :T&abs
 }
+%endif
 
 # ----- Document Elements
 
@@ -400,8 +414,10 @@ Document{
 }
 
 FrameOpen{
+%ifplugin tabs
 Open In Ne&w Tab=ID_OPEN_FRAME_IN_NEW_TAB
 Open In Bac&kground Tab=ID_OPEN_FRAME_IN_BACKGROUNDTAB
+%endif
 Open In &New Window=ID_OPEN_FRAME_IN_NEW_WINDOW
 Open In Backgro&und Window=ID_OPEN_FRAME_IN_BACKGROUND
 }
@@ -425,9 +441,11 @@ LinkCopy{
 &Copy Link URL=ID_COPY_LINK_LOCATION
 }
 LinkOpen{
+%ifplugin tabs
 Open In Ne&w Tab=ID_OPEN_LINK_IN_NEW_TAB
 Open In Bac&kground Tab=ID_OPEN_LINK_IN_BACKGROUNDTAB
 -
+%endif
 Open In &New Window=ID_OPEN_LINK_IN_NEW_WINDOW
 Open In Backgro&und Window=ID_OPEN_LINK_IN_BACKGROUND
 }

k-meleon/default/skins/Klassic/toolbars.cfg

@@ -263,46 +263,50 @@ Mail/&News Buttons{
 
 Tab/&Window Buttons{
 
-	Prev{
-# Tabs:
-	ID_TAB_PREV|Prev
-	Previous Tab. Right-click for more options.
-# No tabs:
-#	ID_WINDOW_PREV
-#	Previous Window
-	layerwindowhot.bmp[1]
-	layerwindowcold.bmp[1]
-	}
+#	Prev{
+#	%ifplugin tabs
+#	ID_TAB_PREV|Prev
+#	Previous Tab. Right-click for more options.
+#	%else
+#	ID_WINDOW_PREV|Prev
+#	Previous Window. Right-click for more options.
+#	%endif
+#	layerwindowhot.bmp[1]
+#	layerwindowcold.bmp[1]
+#	}
 
-	Next{
-# Tabs:
-	ID_TAB_NEXT|Next
-	Next Tab. Right-click for more options.
-# No tabs:
-#	ID_WINDOW_NEXT
-#	Next Window
-	layerwindowhot.bmp[0]
-	layerwindowcold.bmp[0]
-	}
+#	Next{
+#	%ifplugin tabs
+#	ID_TAB_NEXT|Next
+#	Next Tab. Right-click for more options.
+#	%else
+#	ID_WINDOW_NEXT|Next
+#	Next Window. Right-click for more options.
+#	%endif
+#	layerwindowhot.bmp[0]
+#	layerwindowcold.bmp[0]
+#	}
 
 	New{
-# Tabs:
+	%ifplugin tabs
 	ID_NEW_TAB|New
 	New Tab. Right-click for more options.
-# No tabs:
-#	ID_NEW_BROWSER
-#	New Window
+	%else
+	ID_NEW_BROWSER
+	New Window
+	%endif
 	layerwindowhot.bmp[2]
 	layerwindowcold.bmp[2]
 	}
 
 	Close{
-# Tabs:
+	%ifplugin tabs
 	ID_CLOSE_TAB|Close
 	Close Tab. Right-click for more options.
-# No tabs:
-#	ID_FILE_CLOSE|Close
-#	Close Window. Right-click for more options.
+	%else
+	ID_FILE_CLOSE|Close
+	Close Window. Right-click for more options.
+	%endif
 	layerwindowhot.bmp[3]
 	layerwindowcold.bmp[3]
 	}

k-meleon/default/skins/Phoenity(Large)/toolbars.cfg

@@ -246,48 +246,52 @@ Mail/&News Buttons(24,24){
 
 Tab/&Window Buttons{
 
-	Prev{
-# Tabs:
-	ID_TAB_PREV|Prev
-	Previous Tab. Right-click for more options.
-# No tabs:
-#	ID_WINDOW_PREV
-#	Previous Window
-	layerwindowhot.bmp[0]
-	layerwindowcold.bmp[0]
-	}
+#	Prev{
+#	%ifplugin tabs
+#	ID_TAB_PREV|Prev
+#	Previous Tab. Right-click for more options.
+#	%else
+#	ID_WINDOW_PREV|Prev
+#	Previous Window. Right-click for more options.
+#	%endif
+#	layerwindowhot.bmp[0]
+#	layerwindowcold.bmp[0]
+#	}
 
-	Next{
-# Tabs:
-	ID_TAB_NEXT|Next
-	Next Tab. Right-click for more options.
-# No tabs:
-#	ID_WINDOW_NEXT
-#	Next Window
-	layerwindowhot.bmp[1]
-	layerwindowcold.bmp[1]
-	}
+#	Next{
+#	%ifplugin tabs
+#	ID_TAB_NEXT|Next
+#	Next Tab. Right-click for more options.
+#	%else
+#	ID_WINDOW_NEXT|Next
+#	Next Window. Right-click for more options.
+#	%endif
+#	layerwindowhot.bmp[1]
+#	layerwindowcold.bmp[1]
+#	}
 
 #	-
 
 	New{
-# Tabs:
+	%ifplugin tabs
 	ID_NEW_TAB|New
 	New Tab. Right-click for more options.
-# No tabs:
-#	ID_NEW_BROWSER
-#	New Window
+	%else
+	ID_NEW_BROWSER
+	New Window
+	%endif
 	layerwindowhot.bmp[2]
 	layerwindowcold.bmp[2]
 	}
 
 	Close{
-# Tabs:
+	%ifplugin tabs
 	ID_CLOSE_TAB|Close
 	Close Tab. Right-click for more options.
-# No tabs:
-#	ID_FILE_CLOSE|Close
-#	Close Window. Right-click for more options.
+	%else
+	ID_FILE_CLOSE|Close
+	Close Window. Right-click for more options.
+	%endif
 	layerwindowhot.bmp[3]
 	layerwindowcold.bmp[3]
 	}

k-meleon/default/skins/Phoenity/toolbars.cfg

@@ -246,48 +246,52 @@ Mail/&News Buttons{
 
 Tab/&Window Buttons{
 
-	Prev{
-# Tabs:
-	ID_TAB_PREV|Prev
-	Previous Tab. Right-click for more options.
-# No tabs:
-#	ID_WINDOW_PREV
-#	Previous Window
-	layerwindowhot.bmp[0]
-	layerwindowcold.bmp[0]
-	}
+#	Prev{
+#	%ifplugin tabs
+#	ID_TAB_PREV|Prev
+#	Previous Tab. Right-click for more options.
+#	%else
+#	ID_WINDOW_PREV|Prev
+#	Previous Window. Right-click for more options.
+#	%endif
+#	layerwindowhot.bmp[0]
+#	layerwindowcold.bmp[0]
+#	}
 
-	Next{
-# Tabs:
-	ID_TAB_NEXT|Next
-	Next Tab. Right-click for more options.
-# No tabs:
-#	ID_WINDOW_NEXT
-#	Next Window
-	layerwindowhot.bmp[1]
-	layerwindowcold.bmp[1]
-	}
+#	Next{
+#	%ifplugin tabs
+#	ID_TAB_NEXT|Next
+#	Next Tab. Right-click for more options.
+#	%else
+#	ID_WINDOW_NEXT|Next
+#	Next Window. Right-click for more options.
+#	%endif
+#	layerwindowhot.bmp[1]
+#	layerwindowcold.bmp[1]
+#	}
 
 #	-
 
 	New{
-# Tabs:
+	%ifplugin tabs
 	ID_NEW_TAB|New
 	New Tab. Right-click for more options.
-# No tabs:
-#	ID_NEW_BROWSER
-#	New Window
+	%else
+	ID_NEW_BROWSER
+	New Window
+	%endif
 	layerwindowhot.bmp[2]
 	layerwindowcold.bmp[2]
 	}
 
 	Close{
-# Tabs:
+	%ifplugin tabs
 	ID_CLOSE_TAB|Close
 	Close Tab. Right-click for more options.
-# No tabs:
-#	ID_FILE_CLOSE|Close
-#	Close Window. Right-click for more options.
+	%else
+	ID_FILE_CLOSE|Close
+	Close Window. Right-click for more options.
+	%endif
 	layerwindowhot.bmp[3]
 	layerwindowcold.bmp[3]
 	}