+1 -1

OuchBrowser/Actions.cs

··· 11 11 win = window; 12 12 } 13 13 14 14 - public void AddAction(string name, GObject.SignalHandler<SimpleAction, SimpleAction.ActivateSignalArgs>action) 14 14 + public void AddAction(string name, GObject.SignalHandler<SimpleAction, SimpleAction.ActivateSignalArgs> action) 15 15 { 16 16 var simpleaction = SimpleAction.New(name, null); 17 17 simpleaction.OnActivate += action;

+1 -4

OuchBrowser/OuchBrowser.csproj

··· 20 20 </ItemGroup> 21 21 22 22 <ItemGroup> 23 23 - <EmbeddedResource 24 24 - Include="OuchBrowser.app.gresource" 25 25 - LogicalName="OuchBrowser.app.gresource" 26 26 - /> 23 23 + <EmbeddedResource Include="OuchBrowser.app.gresource" LogicalName="OuchBrowser.app.gresource" /> 27 24 28 25 <!-- CSS --> 29 26 <EmbeddedResource Include="Styles.css" />

+1 -2

OuchBrowser/Program.cs

··· 21 21 RegisterResources(); 22 22 RegisterCss(); 23 23 24 24 - app.OnStartup += Window.OnStartup; 25 25 - app.OnActivate += Window.OnActivate; 24 24 + app.OnActivate += window.OnActivate; 26 25 27 26 return app.RunWithSynchronizationContext(null); 28 27 }

+64 -54

OuchBrowser/UI/Window.blp

··· 148 148 margin-end: 0; 149 149 } 150 150 151 151 - Button { 152 152 - margin-start: 10; 153 153 - margin-end: 0; 154 154 - action-name: "win.palette-new"; 151 151 + ScrolledWindow { 152 152 + vscrollbar-policy: external; 155 153 156 154 Box { 157 157 - spacing: 10; 155 155 + orientation: vertical; 158 156 159 159 - Image { 160 160 - icon-name: "list-add-symbolic"; 157 157 + Button { 158 158 + margin-start: 10; 159 159 + margin-end: 0; 160 160 + action-name: "win.palette-new"; 161 161 162 162 - styles [ 163 163 - "dimmed", 164 164 - ] 165 165 - } 162 162 + Box { 163 163 + spacing: 10; 164 164 + 165 165 + Image { 166 166 + icon-name: "list-add-symbolic"; 167 167 + 168 168 + styles [ 169 169 + "dimmed", 170 170 + ] 171 171 + } 172 172 + 173 173 + Label { 174 174 + label: _("New tab"); 166 175 167 167 - Label { 168 168 - label: _("New tab"); 176 176 + styles [ 177 177 + "dimmed", 178 178 + "font-medium", 179 179 + ] 180 180 + } 181 181 + } 169 182 170 183 styles [ 171 171 - "dimmed", 172 172 - "reset-font-weight", 184 184 + "flat", 173 185 ] 174 186 } 175 175 - } 176 187 177 177 - styles [ 178 178 - "flat", 179 179 - ] 180 180 - } 181 181 - 182 182 - ListView tabs { 183 183 - model: bind view.pages; 188 188 + ListView tabs { 189 189 + vexpand: true; 190 190 + model: bind view.pages; 184 191 185 185 - factory: BuilderListItemFactory { 186 186 - template ListItem { 187 187 - child: CenterBox { 188 188 - start-widget: Box { 189 189 - spacing: 10; 192 192 + factory: BuilderListItemFactory { 193 193 + template ListItem { 194 194 + child: CenterBox { 195 195 + start-widget: Box { 196 196 + spacing: 10; 190 197 191 191 - Image tab_icon { 192 192 - // gicon: bind template.item as <Adw.TabPage>.icon; 193 193 - icon-name: "box-dotted-symbolic"; 194 194 - visible: bind spinner.visible inverted; 198 198 + Image tab_icon { 199 199 + // gicon: bind template.item as <Adw.TabPage>.icon; 200 200 + icon-name: "box-dotted-symbolic"; 201 201 + visible: bind spinner.visible inverted; 195 202 196 196 - styles [ 197 197 - "dimmed", 198 198 - ] 199 199 - } 203 203 + styles [ 204 204 + "dimmed", 205 205 + ] 206 206 + } 200 207 201 201 - Adw.Spinner spinner { 202 202 - width-request: 16; 203 203 - height-request: 16; 204 204 - visible: bind template.item as <Adw.TabPage>.loading; 205 205 - } 208 208 + Adw.Spinner spinner { 209 209 + width-request: 16; 210 210 + height-request: 16; 211 211 + visible: bind template.item as <Adw.TabPage>.loading; 212 212 + } 206 213 207 207 - Label { 208 208 - label: bind template.item as <Adw.TabPage>.title; 209 209 - ellipsize: end; 210 210 - halign: start; 211 211 - hexpand: true; 212 212 - tooltip-text: bind template.item as <Adw.TabPage>.keyword; 213 213 - } 214 214 - }; 214 214 + Label { 215 215 + label: bind template.item as <Adw.TabPage>.title; 216 216 + ellipsize: end; 217 217 + halign: start; 218 218 + hexpand: true; 219 219 + tooltip-text: bind template.item as <Adw.TabPage>.keyword; 220 220 + } 221 221 + }; 222 222 + }; 223 223 + } 215 224 }; 216 216 - } 217 217 - }; 218 225 219 219 - styles [ 220 220 - "navigation-sidebar", 221 221 - ] 226 226 + styles [ 227 227 + "navigation-sidebar", 228 228 + ] 229 229 + } 230 230 + } 222 231 } 223 232 } 224 233 ··· 226 235 CenterBox { 227 236 margin-bottom: 6; 228 237 margin-start: 6; 238 238 + margin-top: 6; 229 239 230 240 start-widget: MenuButton { 231 241 icon-name: "shoe-box-symbolic";

+26

OuchBrowser/Utils/Url.cs

··· 1 1 + // I FUCKING HATE THE .NET DEVELOPERS FUCK FLURL FUCK SYSTEM.URI THERE IS 2 2 + // NO POINT TO LIFE ANYMORE 3 3 + // 4 4 + // THIS FILE IS MY PERSONAL FUCK YOU TO THE DEVELOPERS TO EVERY SINGLE LIBRARY 5 5 + // WHO HAS FAILED TO HANDLE SCHEMELESS URLS AND OTHER OBSCURE URL TYPES 6 6 + 7 7 + namespace OuchBrowser.Utils; 8 8 + 9 9 + class Url 10 10 + { 11 11 + public static bool IsUrl(string url) 12 12 + { 13 13 + if (url.StartsWith("https://") || url.StartsWith("http://")) // e.g. https://example.com 14 14 + { 15 15 + return true; 16 16 + } 17 17 + else if (url.Contains('.')) // e.g. example.com 18 18 + { 19 19 + return true; 20 20 + } 21 21 + else // e.g. example com 22 22 + { 23 23 + return false; 24 24 + } 25 25 + } 26 26 + }

+59 -2

OuchBrowser/Window.cs

··· 3 3 using WebKit; 4 4 using Application = Adw.Application; 5 5 using Object = GObject.Object; 6 6 + using OuchBrowser.Utils; 6 7 7 8 namespace OuchBrowser; 8 9 9 10 public class Window 10 11 { 11 11 - public static void OnActivate(Object app, EventArgs args) 12 12 + private string palette_state = "new_tab"; 13 13 + 14 14 + public Window() { } 15 15 + 16 16 + public void OnActivate(Object app, EventArgs args) 12 17 { 13 18 var application = (Application)app; 14 19 var window = new UI.Window(application); ··· 23 28 window.url_entry!.SetBuffer(buffer); 24 29 window.url_dialog!.Present(window); 25 30 window.url_entry!.GrabFocus(); 31 31 + palette_state = "new_tab"; 26 32 }); 27 33 actions.AddAction("palette", (action, parameter) => 28 34 { ··· 32 38 window.url_entry!.SetBuffer(buffer); 33 39 window.url_dialog!.Present(window); 34 40 window.url_entry!.GrabFocus(); 41 41 + palette_state = "current_tab"; 35 42 }); 36 43 application.SetAccelsForAction("win.palette-new", ["<Ctrl>t"]); 37 44 application.SetAccelsForAction("win.palette", ["<Ctrl>l"]); 38 45 39 46 window.url_entry!.OnActivate += (entry, _) => 40 47 { 41 41 - view.AddTab($"https://google.com/search?q={entry.GetBuffer().GetText()}", false); 48 48 + string query = entry.GetBuffer().GetText(); 49 49 + 50 50 + if (palette_state == "new_tab") 51 51 + { 52 52 + Console.WriteLine($"url: {query}"); 53 53 + Console.WriteLine($"isURL: {Url.IsUrl(query)}"); 54 54 + Console.WriteLine($"starts with https or http: {query.StartsWith("https://") || query.StartsWith("http://")}"); 55 55 + Console.WriteLine(""); 56 56 + 57 57 + if (Url.IsUrl(query)) 58 58 + { 59 59 + if (query.StartsWith("https://") || query.StartsWith("http://")) 60 60 + { 61 61 + view.AddTab(query, false); 62 62 + } 63 63 + else 64 64 + { 65 65 + view.AddTab($"https://{query}", false); 66 66 + } 67 67 + } 68 68 + else 69 69 + { 70 70 + view.AddTab($"https://google.com/search?q={query}", false); 71 71 + } 72 72 + } 73 73 + else 74 74 + { 75 75 + TabPage page = window.view!.GetSelectedPage()!; 76 76 + WebView webview = (WebView)page.Child!; 77 77 + 78 78 + Console.WriteLine($"url: {query}"); 79 79 + Console.WriteLine($"isURL: {Url.IsUrl(query)}"); 80 80 + Console.WriteLine($"starts with https or http: {query.StartsWith("https://") || query.StartsWith("http://")}"); 81 81 + Console.WriteLine(""); 82 82 + 83 83 + if (Url.IsUrl(query)) 84 84 + { 85 85 + if (query.StartsWith("https://") || query.StartsWith("http://")) 86 86 + { 87 87 + webview.LoadUri(query); 88 88 + } 89 89 + else 90 90 + { 91 91 + webview.LoadUri($"https://{query}"); 92 92 + } 93 93 + } 94 94 + else 95 95 + { 96 96 + webview.LoadUri($"https://google.com/search?q={query}"); 97 97 + } 98 98 + } 42 99 43 100 window.url_dialog!.ForceClose(); 44 101 window.url_dialog!.SetCanClose(true);